[SCM] qt5webkit packaging branch, master, updated. debian/5.2.0+dfsg-2-11-g1ddcac6

[Lisandro Damián Nicanor Pérez]

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

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

diff --git a/debian/changelog b/debian/changelog
index 4cf6fd7..8df4bad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ qtwebkit-opensource-src (5.2.0+dfsg-3) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Remove glslang_bison3.diff, applied upstream.
+  * 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>  Sun, 05 Jan 2014 22:35:45 +0400
 
diff --git a/debian/control b/debian/control
index 18606bd..c145012 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 9.0.0),
                libxrender-dev,
                libxslt1-dev,
                libqt5xmlpatterns5-private-dev (>= 5.2.0-1~),
-               qtbase5-private-dev (>= 5.2.0+dfsg~),
+               qtbase5-private-dev (>= 5.2.0+dfsg-7~),
                libqt5opengl5-dev (>= 5.2.0+dfsg~),
                qtscript5-private-dev (>= 5.2.0-1~),
                qtdeclarative5-private-dev (>= 5.2.0-1~),
diff --git a/debian/libqt5webkit5-dev.install b/debian/libqt5webkit5-dev.install
index 4bb7b89..ce23ae7 100644
--- a/debian/libqt5webkit5-dev.install
+++ b/debian/libqt5webkit5-dev.install
@@ -54,5 +54,5 @@ usr/lib/*/libQt5WebKitWidgets.prl
 usr/lib/*/libQt5WebKitWidgets.so
 usr/lib/*/pkgconfig/Qt5WebKit.pc
 usr/lib/*/pkgconfig/Qt5WebKitWidgets.pc
-usr/share/qt5/mkspecs/modules/qt_lib_webkit.pri
-usr/share/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_webkit.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_webkitwidgets.pri
diff --git a/debian/rules b/debian/rules
index 8898020..29be7ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,8 +60,8 @@ override_dh_auto_install-arch:
 	rm -rf debian/tmp/usr/include/qt5/QtWebKit/*/QtWebKit
 	rm -rf debian/tmp/usr/include/qt5/QtWebKitWidgets/*/QtWebKitWidgets
 	# And associated files
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_webkit_private.pri
-	rm -fv debian/tmp/usr/share/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkit_private.pri
+	rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_webkitwidgets_private.pri
 	
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la

-- 
qt5webkit packaging