[SCM] qtbase packaging branch, master, updated. debian/5.5.1+dfsg-16-2-gcf43dae

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit cf43dae52ee2da59592ce80983cc84b5da378033
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Mar 21 21:23:28 2016 +0100

    Move qtchooser configuration files from libqt5core5a to qtchooser itself.
    
    Bump qtchooser dependency for qt5-qmake and qtbase5-dev-tools.
    Closes: #818536.
---
 debian/changelog                   |  4 ++++
 debian/control                     |  9 ++++++---
 debian/libqt5core5a.install-common |  3 ---
 debian/rules                       | 10 +---------
 4 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 131229e..de02b7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.5.1+dfsg-17) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Move qtchooser configuration files from libqt5core5a to qtchooser itself.
+  * Bump qtchooser dependency for qt5-qmake and qtbase5-dev-tools (closes:
+    #818536).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 21 Mar 2016 21:20:52 +0100
 
diff --git a/debian/control b/debian/control
index c8a1065..747face 100644
--- a/debian/control
+++ b/debian/control
@@ -377,7 +377,10 @@ Package: qtbase5-dev-tools
 Architecture: any
 Multi-Arch: foreign
 Section: devel
-Depends: qtchooser, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Depends: qtchooser (>= 55-gc9562a1-1~),
+         ${misc:Depends},
+         ${perl:Depends},
+         ${shlibs:Depends}
 Description: Qt 5 base development programs
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -390,7 +393,7 @@ Package: qt5-qmake
 Architecture: any
 Multi-Arch: same
 Section: devel
-Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
+Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 5 qmake Makefile generator tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -458,7 +461,7 @@ Description: Qt 5 base examples debugging symbols
 
 Package: qt5-default
 Architecture: any
-Depends: qtbase5-dev, qtchooser, ${misc:Depends}
+Depends: qtbase5-dev, qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}
 Conflicts: qt4-default
 Suggests: qt5-qmake, qtbase5-dev-tools
 Description: Qt 5 development defaults package
diff --git a/debian/libqt5core5a.install-common b/debian/libqt5core5a.install-common
index b3c2e5e..9e7ea9b 100644
--- a/debian/libqt5core5a.install-common
+++ b/debian/libqt5core5a.install-common
@@ -1,4 +1 @@
 usr/lib/*/libQt5Core.so.*
-usr/lib/*/qtchooser/5.conf
-usr/lib/*/qtchooser/qt5.conf
-usr/share/qtchooser/qt5-*.conf
diff --git a/debian/rules b/debian/rules
index 2353a8d..6546949 100755
--- a/debian/rules
+++ b/debian/rules
@@ -252,16 +252,8 @@ endif
 	find $(CURDIR)/debian/tmp/usr/lib/*/pkgconfig -type f -name '*.pc' \
 		-exec perl -pi -e "s, -L$(CURDIR)/?\S+,,g" {} \;
 
-	# Add a configuration for qtchooser
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf
-
-	# Ship 5.conf and qt5.conf for this arch, and a default.conf.
-	# 5.conf makes calling qtchooser prettier.
+	# Configuration file for qt5-default package
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
-	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/5.conf
-	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt5.conf
 	ln -s /usr/share/qtchooser/qt5-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
 
 	# Remove leftover directories

-- 
qtbase packaging