[SCM] qtmultimedia packaging branch, experimental, updated. debian/5.2.0-3

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 2709869c13d8466a0c3b13a81403d9c0b4875da4
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jan 31 20:02:54 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                   | 4 ++--
 debian/qtmultimedia5-dev.install | 4 ++--
 debian/rules                     | 6 +++---
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0d9b7c0..9ca8001 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ qtmultimedia-opensource-src (5.2.0-3) 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 12:45:11 +0100
 
 qtmultimedia-opensource-src (5.2.0-2) experimental; urgency=medium
diff --git a/debian/control b/debian/control
index e7b8c32..2649e0b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,8 @@ Build-Depends: debhelper (>= 9.0.0),
                libpulse-dev,
                libqt5opengl5-dev (>= 5.2.0+dfsg~),
                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~),
                qtdeclarative5-private-dev (>= 5.2.0-1~),
                zlib1g-dev
 Build-Depends-Indep: libqt5sql5-sqlite, qttools5-dev-tools (>= 5.2.0-1~)
diff --git a/debian/qtmultimedia5-dev.install b/debian/qtmultimedia5-dev.install
index af1887d..672e576 100644
--- a/debian/qtmultimedia5-dev.install
+++ b/debian/qtmultimedia5-dev.install
@@ -195,5 +195,5 @@ usr/lib/*/libqgsttools_p.so
 usr/lib/*/pkgconfig/Qt5Multimedia.pc
 usr/lib/*/pkgconfig/Qt5MultimediaQuick_p.pc
 usr/lib/*/pkgconfig/Qt5MultimediaWidgets.pc
-usr/share/qt5/mkspecs/modules/qt_lib_multimedia.pri
-usr/share/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
diff --git a/debian/rules b/debian/rules
index b136834..52eef98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,9 +27,9 @@ override_dh_auto_install-arch:
 	rm -rfv debian/tmp/usr/include/qt5/QtMultimediaWidgets/*/QtMultimediaWidgets/private/
 	rm -rfv debian/tmp/usr/include/qt5/QtMultimediaQuick_p/QtMultimediaQuick_pDepends
 	# And some other private stuff.
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_multimedia_private.pri
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
 	
 	# Fix wrong path in pkgconfig files
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \

-- 
qtmultimedia packaging