[SCM] qtchooser packaging branch, master, updated. debian/26-2-8-ge1ce3e1

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit e1ce3e185c11cf02d40c488a892c3e35545e5fdc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 13 12:35:45 2013 -0300

    Add three directories for config lookup.
    
    See README.Debain for more details.
---
 debian/README.Debian |   14 ++++++++++++++
 debian/changelog     |    6 ++++--
 debian/rules         |    2 +-
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..0cca913
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,14 @@
+We currently patch qtchooser to make it look for configs
+in three additional directories:
+
+- /usr/share/qtchooser: holds qtx-triplet.conf configs.
+  They are installed by libqtcore with it's arch triplet. In this way apps can
+  call it's specific arch tools.
+
+- /usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser: holds qtx.conf and default.conf for
+  the specific arch.
+
+- /usr/lib/$(DEB_HOST_MULTIARCH)/qt-default/qtchooser: holds a default.conf which
+  points to Qt4. In this way the Qt4 packages already in the archive should not
+  FTBFS when we introduce qtchooser in unstable. Exporting QT_SELECT=qt4 or
+  build-depending on qt4-default is recommended.
diff --git a/debian/changelog b/debian/changelog
index 821c4ee..1f84b65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,12 +9,14 @@ qtchooser (26-3) UNRELEASED; urgency=low
   * Drop the own copy of qtchooser.1 and use the upstream version.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Add a fallback path to check for a default config. In this way:
+  * Add a three possible paths for configs. In this way:
+    - We can add arch-triplet qualified configs.
+    - We can install arch-specific configs.
     - We avoid FTBFS of Qt4 packages already in the archive without the need to
       patch debhelper for this.
     - Tools like qdbus will fallback to the Qt4 version even if qt4-default is
       not installed.
-    Apps wanting to use Qt5's qdbus should explicetely call it with -qt=qt5.
+    Apps wanting to use Qt5's qdbus should explicitely call it with -qt=qt5.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Apr 2013 16:31:49 +0200
 
diff --git a/debian/rules b/debian/rules
index 165d8ba..e5dc733 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 	dh $@ 
 
 override_dh_auto_build:
-	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH)
+	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default
 
 override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser

-- 
qtchooser packaging