[SCM] qttools packaging branch, master, updated. e159c381c4f4ca01d18608b81216f2575ec8854d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 2f0319b89745d3ea47be1bdd7802f0dff58fe526
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 20 14:22:58 2013 -0300

    Export QT_SELECT=qt5 to avoid a FTBFS.
    
    When the debhelper patch that makes
    Qt4 as default get included.
---
 debian/changelog |    2 ++
 debian/rules     |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a9d0292..2f7c1b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qttools-opensource-src (5.0.2-3) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Do not pass --list-missing. We are using --fail-missing in the exact rule.
+  * Export QT_SELECT=qt5 to avoid a FTBFS when the debhelper patch that makes
+    Qt4 as default get included.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Apr 2013 14:13:00 -0300
 
diff --git a/debian/rules b/debian/rules
index 2055504..b196f72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
+export QT_SELECT := qt5
 
 %:
 	dh $@ --with pkgkde_symbolshelper --parallel

-- 
qttools packaging