[SCM] qtx11extras packaging branch, master, updated. debian/5.2.0-1-8-g1c70c3e

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 1c70c3eccd88df168342dfc83e985890bab231a6
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 31 15:32:13 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                    | 2 ++
 debian/control                      | 4 ++--
 debian/libqt5x11extras5-dev.install | 2 +-
 debian/rules                        | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4ce861..f7354c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ qtx11extras-opensource-src (5.2.0-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Fix orthography in 5.1.1-1 changelog.
+  * 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, 11 Jan 2014 17:31:57 +0400
 
diff --git a/debian/control b/debian/control
index cbd1a49..9bf4647 100644
--- a/debian/control
+++ b/debian/control
@@ -11,8 +11,8 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Timo Jyrinki <timo at debian.org>
 Build-Depends: debhelper (>= 9),
                pkg-kde-tools,
-               qtbase5-dev (>= 5.2.0+dfsg~),
-               qtbase5-private-dev (>= 5.2.0+dfsg~)
+               qtbase5-dev (>= 5.2.0+dfsg-7~),
+               qtbase5-private-dev (>= 5.2.0+dfsg-7~)
 Build-Depends-Indep: libqt5sql5-sqlite (>= 5.2.0+dfsg~),
                      qttools5-dev-tools (>= 5.2.0-1~)
 Standards-Version: 3.9.5
diff --git a/debian/libqt5x11extras5-dev.install b/debian/libqt5x11extras5-dev.install
index 177e824..a726be9 100644
--- a/debian/libqt5x11extras5-dev.install
+++ b/debian/libqt5x11extras5-dev.install
@@ -3,4 +3,4 @@ usr/lib/*/cmake/*
 usr/lib/*/libQt5X11Extras.prl
 usr/lib/*/libQt5X11Extras.so
 usr/lib/*/pkgconfig/Qt5X11Extras.pc
-usr/share/qt5/mkspecs/modules/qt_lib_x11extras.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_x11extras.pri
diff --git a/debian/rules b/debian/rules
index c98b3ba..673b7ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,7 +32,7 @@ override_dh_auto_install-arch:
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
 	# Remove private stuff which we are not shipping.
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_x11extras_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_x11extras_private.pri
 	
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \

-- 
qtx11extras packaging