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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit f21ccbae9995c799359aa1fe3ead22b48759743a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 13 16:15:39 2013 -0300

    Ship multi-arch aware configs files.
    
    See qtchooser's README.Debian for more info.
---
 debian/changelog           |   10 ++++------
 debian/libqtcore4.install  |    4 +++-
 debian/qt4-default.install |    2 +-
 debian/rules               |   15 ++++++++++-----
 4 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dd500f9..c28219b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,11 @@
-qt4-x11 (4:4.8.4+dfsg-3) UNRELEASED; urgency=low
+qt4-x11 (4:4.8.4+dfsg-2r4) 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.
   * Update symbols files.
-  * Move qt4.conf from libqt4-dev to libqtcore4. It will not be strange to find
-    apps explicitely calling the qt4 config.
-    - Add Breaks+Replaces to libqtcore4 against libqt4-dev << 4:4.8.4+dfsg-3~.
+  * Ship multi-arch aware configs files and a last resort fallback qt4.conf to
+    avoid FTBFSs in Qt4 packages already in the archive. See README.Debian for
+    more info.
   * Remove Break+Replaces for packages older than what Squeeze shipped.
 
  -- 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 95bef9b..ee0daf8 100644
--- a/debian/libqtcore4.install
+++ b/debian/libqtcore4.install
@@ -24,4 +24,6 @@ usr/share/qt4/translations/qt_sv.qm
 usr/share/qt4/translations/qt_uk.qm
 usr/share/qt4/translations/qt_zh_CN.qm
 usr/share/qt4/translations/qt_zh_TW.qm
-usr/share/qtchooser/qt4.conf
+usr/share/qtchooser/qt4-*.conf
+usr/lib/*/qtchooser/qt4.conf
+usr/lib/*/qt-default/qtchooser/default.conf
diff --git a/debian/qt4-default.install b/debian/qt4-default.install
index 85422d0..6b53775 100644
--- a/debian/qt4-default.install
+++ b/debian/qt4-default.install
@@ -1 +1 @@
-usr/share/qtchooser/default.conf
+usr/lib/*/qtchooser/default.conf
diff --git a/debian/rules b/debian/rules
index 507725c..943d5a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -321,13 +321,18 @@ override_dh_auto_install:
 
 	# Add a configuration for qtchooser
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/qtchooser
-	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/qt4/bin" > $(CURDIR)/debian/tmp/usr/share/qtchooser/qt4.conf
-	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
+	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
 
-	# Use qtchooser's qt4 config as the second option path for qtchooser.
+	# Ship qt4.conf for this arch, and a default.conf.
 	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
+	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
+
+	# As a special case to avoid FTBFSs for current Qt4 packages, ship a second
+	# default.conf which will be searched by qtchooser. Only Qt4 should ship this.
+	mkdir -p $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default/qtchooser
+	ln -s /usr/share/qtchooser/qt4-$(DEB_HOST_MULTIARCH).conf $(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default/qtchooser/default.conf
 
 	# Remove leftover directories
 	find $(CURDIR)/debian/tmp/usr/lib/qt4 -depth -type d \( -false \

-- 
Qt 4 packaging