[SCM] qtchooser packaging branch, master, updated. debian/52-gae5eeef-1-2-gafc7437

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 27b0e22e67190e8934ef18c687de816d72d7b14c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Feb 10 19:58:00 2015 -0300

    Refresh enable-tests.patch.
---
 debian/changelog                  | 1 +
 debian/patches/enable-tests.patch | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bd53524..cc1713c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtchooser (52-gae5eeef-1) UNRELEASED; urgency=medium
   * New upstream git snapshot.
   * Do not mention qtx-default packages in the long description. We don't want
     people to use them to build packages.
+  * Refresh enable-tests.patch.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 12 Jan 2015 11:41:32 -0300
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 62b3805..650d52d 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -4,7 +4,7 @@ Date:   Wed Mar 13 14:14:07 2013 +0000
 Description: Enable running tests during the build.
  Point to the exact location of Qt5's qmake while building the tests.
  We still don't have qtchooser available ;)
-Last-Update: 2014-09-19
+Last-Update: 2015-02-10
 
 
 ---
@@ -18,11 +18,11 @@ Last-Update: 2014-09-19
  MKDIR  = mkdir -p
  prefix = /usr
  bindir = $(prefix)/bin
-@@ -72,7 +73,8 @@ uninstall:
+@@ -75,7 +76,8 @@ uninstall:
  	;; esac
  
  tests/auto/Makefile: tests/auto/auto.pro
--	cd tests/auto && qmake -o Makefile auto.pro
+-	cd tests/auto && $(QMAKE) -o Makefile auto.pro
 +	cd tests/auto && /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake -o Makefile auto.pro
 +	cd tests/auto/qtchooser && /usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake -o Makefile qtchooser.pro
  

-- 
qtchooser packaging