[SCM] qtchooser packaging branch, master, updated. c3bd6ffa15a743c947f35d7ca3bcf4bb2fc2fb55

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit 9155fdea19a0586fde11073cb1f1dd2f58d0b7b8
Author: Michael Terry <michael.terry at canonical.com>
Date:   Wed Mar 13 14:14:07 2013 +0000

    Enable running tests during the build.
---
 debian/control                    |    2 +-
 debian/patches/enable-tests.patch |   14 ++++++++++++++
 debian/patches/series             |    1 +
 debian/rules                      |    3 ---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 793a582..faeb1f4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libdevel
 Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Timo Jyrinki <timo at debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), libqt4-dev
 Standards-Version: 3.9.4
 Homepage: https://qt-project.org/
 
diff --git a/debian/patches/enable-tests.patch b/debian/patches/enable-tests.patch
new file mode 100644
index 0000000..33fee94
--- /dev/null
+++ b/debian/patches/enable-tests.patch
@@ -0,0 +1,14 @@
+Index: qtchooser-0.0.1~git20121229.g8f08405/Makefile
+===================================================================
+--- qtchooser-0.0.1~git20121229.g8f08405.orig/Makefile	2013-02-12 10:10:11.000000000 -0500
++++ qtchooser-0.0.1~git20121229.g8f08405/Makefile	2013-02-12 10:24:08.057176403 -0500
+@@ -56,7 +56,8 @@
+ 	-for tool in $(TOOLS); do rm -f "$(INSTALL_ROOT)$(bindir)/$$tool"; done
+ 
+ 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
+ 
+ check: tests/auto/Makefile
+ 	cd src/qtchooser && $(MAKE) check
diff --git a/debian/patches/series b/debian/patches/series
index 3be69d4..456ac0b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 create-a-system-default-path.patch
+enable-tests.patch
diff --git a/debian/rules b/debian/rules
index eed6293..fbb4518 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,3 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser
-
-override_dh_auto_test:
-

-- 
qtchooser packaging