[SCM] qtjsbackend packaging branch, master, updated. bda295399c054320151eb1352dbcd55ae16f671f

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit bda295399c054320151eb1352dbcd55ae16f671f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Apr 20 09:37:37 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 |    4 ++++
 debian/control   |    1 -
 debian/rules     |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b902cd3..21348db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
 qtjsbackend-opensource-src (5.0.2-2) 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.
+    - Remove qt5-default as B-D, as it's not really needed now.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Apr 2013 17:58:02 -0300
 
diff --git a/debian/control b/debian/control
index b5f1a4a..df0a0bd 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
                dpkg-dev (>= 1.16.1),
                pkg-kde-tools,
                python,
-               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 09b8318..531b968 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=libqt5v8-5-dbg

-- 
qtjsbackend packaging