[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.2.1-3-9-g9e9b899

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit d3e551b3a42d0ec4718ae482de3c0b3dc71d51e6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed May 28 22:54:38 2014 -0300

    Fix path for removing private headers.
---
 debian/changelog | 1 +
 debian/rules     | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f829eab..3c16f1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ qtmultimedia-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * Move headers to their new multi arch path. Mark development package as
     Multi-Arch: same.
   * Remove transitional packages, they are no longer needed.
+  * Fix path for removing private headers.
 
   [ Pino Toscano ]
   * Enable RPATH in the spectrum example also on kFreeBSD and Hurd; patch
diff --git a/debian/rules b/debian/rules
index 52eef98..1d758b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,9 +23,9 @@ override_dh_auto_install-arch:
 	dh_auto_install
 
 	# Remove private headers.
-	rm -rfv debian/tmp/usr/include/qt5/QtMultimedia/*/QtMultimedia/private
-	rm -rfv debian/tmp/usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/
-	rm -rfv debian/tmp/usr/include/qt5/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
+	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimedia/*/QtMultimedia/private
+	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/
+	rm -rfv debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtMultimediaQuick_p/
 	# And some other private stuff.
 	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia_private.pri
 	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri

-- 
qtmultimedia packaging