[SCM] qtdeclarative packaging branch, master, updated. df28a591223c8efbd5ee471a6e649c166bc45eea

[Lisandro Damián Nicanor Pérez]

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

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

    Export QT_SELECT=qt5.
    
    This will avoid FTBFSs when the patch for debhelper gets accepted.
    Remove qt5-defaults as B-D, because it's now not needed.
---
 debian/control |    1 -
 debian/rules   |    1 +
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index beac1c9..fe30e68 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 9),
                libqt5v8-5-private-dev (>= 5.0.1~),
                libqt5xmlpatterns5-private-dev (>= 5.0.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 5d7b9e7..075f5df 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 $@ --list-missing --parallel --with pkgkde_symbolshelper --dbg-package=qtdeclarative5-dbg

-- 
qtdeclarative packaging