[SCM] qtquick1 packaging branch, master, updated. debian/5.2.0-1-6-gc00f3c9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 78838f90971a1a2c72c9c1579898ece084451503
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Feb 1 14:26:42 2014 -0300

    Move mkspec files to their new location.
    
    B-D on qtbase5-private-dev 5.2.0+dfsg-7 which changed the location.
---
 debian/changelog              | 4 ++++
 debian/control                | 2 +-
 debian/qtquick1-5-dev.install | 2 +-
 debian/rules                  | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4ef44da..a4d267e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ qtquick1-opensource-src (5.2.0-2) UNRELEASED; urgency=low
   * Remove the Pre-Depends on dpkg >= 1.15.6~, since that version is available
     in Squeeze already.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Move mkspec files to their new location.
+    - B-D on qtbase5-private-dev 5.2.0+dfsg-7 which changed the location.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 21 Dec 2013 11:51:09 +0100
 
 qtquick1-opensource-src (5.2.0-1) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index b89cdaa..cd0e52a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools,
-               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               qtbase5-private-dev (>= 5.2.0+dfsg-7~),
                qtscript5-private-dev (>= 5.2.0~),
                qtdeclarative5-private-dev (>= 5.2.0~),
                libqt5opengl5-dev (>= 5.2.0+dfsg~),
diff --git a/debian/qtquick1-5-dev.install b/debian/qtquick1-5-dev.install
index a8a5440..d1e8785 100644
--- a/debian/qtquick1-5-dev.install
+++ b/debian/qtquick1-5-dev.install
@@ -54,4 +54,4 @@ usr/lib/*/cmake/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake
 usr/lib/*/libQt5Declarative.prl
 usr/lib/*/libQt5Declarative.so
 usr/lib/*/pkgconfig/Qt5Declarative.pc
-usr/share/qt5/mkspecs/modules/qt_lib_declarative.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_declarative.pri
diff --git a/debian/rules b/debian/rules
index 2f17870..5d7721b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_install:
 	# Private headers.
 	rm -vrf debian/tmp/usr/include/qt5/QtDeclarative/5.?.?/QtDeclarative/private
 	# And other private stuff.
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_declarative_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_declarative_private.pri
 	# libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 

-- 
qtquick1 packaging