[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=afc7437

The following commit has been merged in the master branch:
commit afc74373e0b93162c4381754d7bb8edbcbf21e35
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Feb 12 11:59:35 2015 +0300

    Drop enable-tests.patch.
    
    Instead just specify path to qmake as a make variable in debian/rules.
---
 debian/changelog                  |  3 +++
 debian/patches/enable-tests.patch | 30 ------------------------------
 debian/patches/series             |  1 -
 debian/rules                      |  2 +-
 4 files changed, 4 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index aa3a945..e0958e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtchooser (52-gae5eeef-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Drop enable-tests.patch, instead just specify path to qmake
+    as a make variable in debian/rules.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 12 Feb 2015 11:57:40 +0300
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
deleted file mode 100644
index 650d52d..0000000
--- a/debian/patches/enable-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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
-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: 2015-02-10
-
-
----
- Makefile |    4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -1,3 +1,4 @@
-+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
- MKDIR  = mkdir -p
- prefix = /usr
- bindir = $(prefix)/bin
-@@ -75,7 +76,8 @@ uninstall:
- 	;; esac
- 
- tests/auto/Makefile: tests/auto/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
- 
- check: tests/auto/Makefile
- 	cd src/qtchooser && $(MAKE) check
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e78b3cb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-enable-tests.patch
diff --git a/debian/rules b/debian/rules
index 5fbda18..4252808 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,5 +16,5 @@ override_dh_auto_install:
 
 override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
-	make check
+	make check QMAKE=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake
 endif

-- 
qtchooser packaging