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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 90a4a36e37526b4a64daf354eb9f115aa750773a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue May 7 00:12:54 2013 -0300

    Also ship a default config in the second search path of qtchooser.
---
 debian/changelog          |    2 ++
 debian/libqtcore4.install |    1 +
 debian/rules              |    4 ++++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 35d5f14..9d8ebeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qt4-x11 (4:4.8.4+dfsg-3) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add armhf to the list of archs that should not use pch to avoid FTBFSs.
+  * Also ship a default config in the second search path of qtchooser, used as
+    a last-resort fallback.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 06 May 2013 21:00:32 -0300
 
diff --git a/debian/libqtcore4.install b/debian/libqtcore4.install
index c100d8f..c85884f 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -1,6 +1,7 @@
 usr/lib/*/libQtCLucene.so.*
 usr/lib/*/libQtCore.so.*
 usr/lib/*/qt4/plugins/codecs/*.so
+usr/lib/*/qtchooser/*
 usr/share/qt4/translations/qt_ar.qm
 usr/share/qt4/translations/qt_cs.qm
 usr/share/qt4/translations/qt_da.qm
diff --git a/debian/rules b/debian/rules
index 90af16f..507725c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -325,6 +325,10 @@ override_dh_auto_install:
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)" >> $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4.conf
 	ln -s /usr/share/qtchooser/qt4.conf $(CURDIR)/debian/tmp/usr/share/qtchooser/default.conf
 
+	# Use qtchooser's qt4 config as the second option path for qtchooser.
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
+	ln -s /usr/share/qtchooser/qt4.conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser/default.conf
+
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/qt4 -depth -type d \( -false \
 	  -o -name .moc\* \

-- 
Qt 4 packaging