[SCM] qtxmlpatterns packaging branch, master, updated. b812c3367fe516f4b6abf299774244db2da9f68a

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit b812c3367fe516f4b6abf299774244db2da9f68a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 20 09:45:00 2013 -0300

    Export QT_SELECT=qt5 to avoid a FTBFS.
    
    When the debhelper patch that makes Qt4 as default get included.
    Remove qt5-default as B-D, as it's not really needed now.
---
 debian/changelog |    5 ++++-
 debian/control   |    1 -
 debian/rules     |    1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8f3eb72..5f19e83 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 qtxmlpatterns-opensource-src (5.0.2-2) UNRELEASED; urgency=low
 
-
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Export QT_SELECT=qt5 to avoid a FTBFS when the debhelper patch that makes
+    Qt4 as default get included.
+    - Remove qt5-default as B-D, as it's not really needed now.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 20 Apr 2013 09:43:42 -0300
 
diff --git a/debian/control b/debian/control
index 98d6068..9a2f07e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
 Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools,
-               qt5-default,
                qtbase5-private-dev (>= 5.0.2~)
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
diff --git a/debian/rules b/debian/rules
index 69460a4..33a4d92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,7 @@
 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 $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtxmlpatterns5-dbg

-- 
qtxmlpatterns packaging