[SCM] qtmultimedia packaging branch, master, updated. debian/5.2.1-2-4-g9ca41ca

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtmultimedia.git;a=commitdiff;h=9ca41ca

The following commit has been merged in the master branch:
commit 9ca41caeac5c8a9bdb4e466faf3bdefb825c3009
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Apr 2 17:02:25 2014 -0300

    Better mangle the files in configure.
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index ee11572..ebf0593 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,14 +17,12 @@ fix_types_archs := kfreebsd-amd64 kfreebsd-i386
 	dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtmultimedia5-dbg
 
 override_dh_auto_configure:
-	qmake
-
-# Use sys/types.h instead of linux/types.h
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(fix_types_archs)))
-override_dh_auto_build-arch:
+	# Use sys/types.h instead of linux/types.h
 	find src/ -type f -exec grep -l "linux/types.h" {} \; | xargs sed -i 's|<linux/types.h>|<sys/types.h>|'
-	dh_auto_build-arch
 endif
+	qmake
+
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs

-- 
qtmultimedia packaging