[SCM] qtlocation packaging branch, master, updated. 63a662c0aec0071149d33397c09aeb6cf4bc2701

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit b3361f454106bc285afb2dbf31994041ee64e898
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Feb 11 05:32:57 2014 +0000

    New mkspecs location
---
 debian/qtlocation5-dev.install | 4 ++--
 debian/rules                   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/qtlocation5-dev.install b/debian/qtlocation5-dev.install
index 29bafe6..58bb599 100644
--- a/debian/qtlocation5-dev.install
+++ b/debian/qtlocation5-dev.install
@@ -127,5 +127,5 @@ usr/lib/*/libQt5Positioning.prl
 usr/lib/*/libQt5Positioning.so
 usr/lib/*/pkgconfig/Qt5Location.pc
 usr/lib/*/pkgconfig/Qt5Positioning.pc
-usr/share/qt5/mkspecs/modules/qt_lib_location.pri
-usr/share/qt5/mkspecs/modules/qt_lib_positioning.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_location.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_positioning.pri
diff --git a/debian/rules b/debian/rules
index f23d3b8..32404bd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_auto_install:
 	# 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 -fv $(CURDIR)/debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_*_private.pri
+	rm -fv $(CURDIR)/debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_*_private.pri
 	
 	# Remove binary that includes libtheora in itself
 	rm -f debian/tmp/usr/lib/*/qt5/examples/qtlocation/declarative/mapviewer/qml_location_mapviewer

-- 
qtlocation packaging