[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-4-3-gb6b6c47

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b6b6c474b1df2509c8cc472c2a816e5ead130e97
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 18 16:28:07 2013 -0300

    Also ship 5.conf.
    
    This makes calls to qtchooser prettier: qtchooser -qt5.
---
 debian/changelog           |    3 +++
 debian/libqt5core5.install |    1 +
 debian/rules               |    4 +++-
 3 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b306eb..5baf5e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.0.2+dfsg1-5) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Update symbols files.
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Also ship 5.conf. This makes calls to qtchooser prettier: qtchooser -qt5.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 May 2013 11:54:35 +0200
 
 qtbase-opensource-src (5.0.2+dfsg1-4) experimental; urgency=low
diff --git a/debian/libqt5core5.install b/debian/libqt5core5.install
index 36d4b10..b3c2e5e 100644
--- a/debian/libqt5core5.install
+++ b/debian/libqt5core5.install
@@ -1,3 +1,4 @@
 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 d79dd9d..fb7a4ff 100755
--- a/debian/rules
+++ b/debian/rules
@@ -222,8 +222,10 @@ override_dh_auto_install:
 	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 qt5.conf for this arch, and a default.conf.
+	# Ship 5.conf and qt5.conf for this arch, and a default.conf.
+	# 5.conf makes calling qtchooser prettier.
 	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
 

-- 
qtbase packaging