[SCM] qtchooser packaging branch, master, updated. debian/26-2-7-g2e7c313

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 2e7c31305f7bbba4fd42ee0829b2e5e599eddcf4
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon May 6 20:55:27 2013 -0300

    Add a fallback path to check for a default config.
    
    See changes in debian/changelog for more info.
---
 debian/changelog |    8 ++++++++
 debian/rules     |    4 +++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c6050e..821c4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,14 @@ qtchooser (26-3) UNRELEASED; urgency=low
     latter.
   * 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:
+    - 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.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 28 Apr 2013 16:31:49 +0200
 
 qtchooser (26-2) experimental; urgency=low
diff --git a/debian/rules b/debian/rules
index f6a6a54..165d8ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,13 @@
 export DEB_CXXFLAGS_MAINT_APPEND := $(shell dpkg-buildflags --get CPPFLAGS)
 export LFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 %:
 	dh $@ 
 
 override_dh_auto_build:
-	make QTCHOOSER_GLOBAL_DIR=/usr/share
+	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser

-- 
qtchooser packaging