[SCM] qtlocation packaging branch, master, updated. debian/5.3.0-1-9-g0b42fdc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 485e90b7db67a821416dd56dcac42c1dbe6f9e4c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu May 29 23:17:30 2014 -0300

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

diff --git a/debian/changelog b/debian/changelog
index 8b4e6df..52b286e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ qtlocation-opensource-src (5.3.0-1) UNRELEASED; urgency=medium
   * Add geoclue as build dependency, it is needed by the tests.
   * Update symbols files with current build log.
   * Update install files.
+  * Fix path for removing private headers.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 27 May 2014 15:28:31 -0300
 
diff --git a/debian/rules b/debian/rules
index b600f86..e6c08bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,8 +33,8 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 	
 	# Remove private stuff
-	rm -rfv $(CURDIR)/debian/tmp/usr/include/qt5/QtLocation/*/QtLocation/private
-	rm -rfv $(CURDIR)/debian/tmp/usr/include/qt5/QtPositioning/*/QtPositioning/private
+	rm -rfv $(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtLocation/*/QtLocation/private
+	rm -rfv $(CURDIR)/debian/tmp/usr/include/$(DEB_HOST_MULTIARCH)/qt5/QtPositioning/*/QtPositioning/private
 	rm -fv $(CURDIR)/debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_*_private.pri
 	
 	# Remove binary that includes libtheora in itself

-- 
qtlocation packaging