[SCM] qtchooser packaging branch, master, updated. debian/39-g4717841-3-6-g4d0f291

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit a60f7c4ae8892588e43bd9eece627c30bfd96c1e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Aug 26 11:14:20 2014 -0300

    Refresh enable-tests.patch to use Qt5. Test now require it.
---
 debian/changelog                  | 3 ++-
 debian/patches/enable-tests.patch | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1cf8db..32d5788 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ qtchooser (47-gd2b7997-1) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream git snapshot.
   * Remove Add-qmlimportscanner-qtpaths.patch, applied upstream.
-  * Refresh enable-tests.patch.
+  * Tests now require Qt5.
+    - Refresh enable-tests.patch to use Qt5.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Aug 2014 10:57:17 -0300
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 42c9b3b..0994466 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -15,8 +15,8 @@ Subject: Enable running tests during the build.
  
  tests/auto/Makefile: tests/auto/auto.pro
 -	cd tests/auto && qmake -o Makefile auto.pro
-+	cd tests/auto && qmake-qt4 -o Makefile auto.pro
-+	cd tests/auto/qtchooser && qmake-qt4 -o Makefile qtchooser.pro
++	cd tests/auto && qmake-qt5 -o Makefile auto.pro
++	cd tests/auto/qtchooser && qmake-qt5 -o Makefile qtchooser.pro
  
  check: tests/auto/Makefile
  	cd src/qtchooser && $(MAKE) check

-- 
qtchooser packaging