[SCM] qtchooser packaging branch, master, updated. debian/47-gd2b7997-1-3-gc9d66e9

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c9d66e9701083ac12e2ec9b24bfb680647204752
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Sep 19 22:10:41 2014 -0300

    Update enable-tests.patch to properly find qt5's qmake
---
 debian/changelog                  |  2 ++
 debian/patches/enable-tests.patch | 22 +++++++++++++++-------
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eaedbe8..cf4d690 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qtchooser (47-gd2b7997-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Re enable tests.
+  * Update enable-tests.patch to properly find qt5's qmake, as we don't have
+    qtchooser available yet ;)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Sep 2014 21:44:18 -0300
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
index 0994466..62b3805 100644
--- a/debian/patches/enable-tests.patch
+++ b/debian/patches/enable-tests.patch
@@ -1,22 +1,30 @@
-commit 9155fdea19a0586fde11073cb1f1dd2f58d0b7b8
 Author: Michael Terry <michael.terry at canonical.com>
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
 Date:   Wed Mar 13 14:14:07 2013 +0000
-Subject: Enable running tests during the build.
+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
 
 
 ---
- Makefile |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ Makefile |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
 
 --- a/Makefile
 +++ b/Makefile
-@@ -72,7 +72,8 @@ uninstall:
+@@ -1,3 +1,4 @@
++DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ MKDIR  = mkdir -p
+ prefix = /usr
+ bindir = $(prefix)/bin
+@@ -72,7 +73,8 @@ uninstall:
  	;; esac
  
  tests/auto/Makefile: tests/auto/auto.pro
 -	cd tests/auto && qmake -o Makefile auto.pro
-+	cd tests/auto && qmake-qt5 -o Makefile auto.pro
-+	cd tests/auto/qtchooser && qmake-qt5 -o Makefile qtchooser.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
  
  check: tests/auto/Makefile
  	cd src/qtchooser && $(MAKE) check

-- 
qtchooser packaging