[SCM] Qt 4 packaging branch, experimental, updated. debian/4.8.4+dfsg-3-2-g321c72d

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=321c72d

The following commit has been merged in the experimental branch:
commit 321c72d25534ab87b66dd53c07f500ad671f598c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat May 18 16:20:42 2013 -0300

    Also ship 4.conf.
    
    This makes calls to qtchooser prettier: qtchooser -qt4.
---
 debian/changelog          |    2 ++
 debian/libqtcore4.install |    1 +
 debian/rules              |    4 +++-
 3 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 65da2ad..1b39983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qt4-x11 (4:4.8.4+dfsg-4) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Also ship 4.conf. This makes calls to qtchooser prettier: qtchooser -qt4.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 May 2013 16:07:49 -0300
 
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index b04e0f3..c234bd7 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -2,6 +2,7 @@ usr/lib/*/libQtCLucene.so.*
 usr/lib/*/libQtCore.so.*
 usr/lib/*/qt-default/qtchooser/default.conf
 usr/lib/*/qt4/plugins/codecs/*.so
+usr/lib/*/qtchooser/4.conf
 usr/lib/*/qtchooser/qt4.conf
 usr/share/qt4/translations/qt_ar.qm
 usr/share/qt4/translations/qt_cs.qm
diff --git a/debian/rules b/debian/rules
index 943d5a9..1d5a8c3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -324,8 +324,10 @@ override_dh_auto_install:
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf
 
-	# Ship qt4.conf for this arch, and a default.conf.
+	# Ship 4.conf and qt4.conf for this arch, and a default.conf.
+	# 4.conf makes calling qtchooser prettier.
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
+	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/4.conf
 	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/qt4.conf
 	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
 

-- 
Qt 4 packaging