[SCM] qt5webkit packaging branch, experimental, updated. debian/5.2.1+dfsg-5-18-gb254585

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 0b34fd46a27459a9ad33212054da86d788bd78ec
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 23 16:11:08 2014 -0300

    Remove private headers with m-a path.
---
 debian/changelog | 2 ++
 debian/rules     | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ccc2dd6..1d05103 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ qtwebkit-opensource-src (5.3.0+dfsg-1) UNRELEASED; urgency=medium
   * Refresh no_gc_sections.diff.
   * Install headers in their new multi-arch qualified path. Marhe the
     development package as Multi-Arch: same.
+  * Take into account the new multi-arch path for removing the private
+    headers.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 May 2014 23:25:31 -0300
 
diff --git a/debian/rules b/debian/rules
index 0813ae3..81ed086 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,11 +65,11 @@ override_dh_auto_install-arch:
 	-exec sed -i -e 's/$(DEB_HOST_MULTIARCH)\/$(DEB_HOST_MULTIARCH)/$(DEB_HOST_MULTIARCH)/g' {} \;
 	
 	# Remove private headers
-	rm -rf debian/tmp/usr/include/qt5/QtWebKit/*/QtWebKit
-	rm -rf debian/tmp/usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets
+	rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKit/*/QtWebKit
+	rm -rf debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtWebKitWidgets/*/QtWebKitWidgets
 	# And associated files
-	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkit_private.pri
-	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webkit_private.pri
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
 	
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la

-- 
qt5webkit packaging