[SCM] qtchooser packaging branch, master, updated. debian/31-g980c64c-3-2-g782e217

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 782e2171c7cee77d2a1a245f5951dfb667dd62cc
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri May 24 14:02:00 2013 -0300

    Re enable tests.
---
 debian/README.source |    8 ++++++++
 debian/changelog     |    4 ++++
 debian/control       |    2 +-
 debian/rules         |    3 ---
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..31f75d1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+= Bootstrapping qtchooser.
+
+qtchooser build-depends on libqt4-dev (and it can also be built with qt5).
+But as of Qt 4:4.8.4, you need qtchooser to run qmake.
+
+Actually qtchooser only needs Qt4 for building it's tests. If you need to
+bootstrap it, simply remove libqt4-dev as build dependency and override
+dh_auto_test in debian/rules.
diff --git a/debian/changelog b/debian/changelog
index d8676af..e8ea2e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtchooser (31-g980c64c-4) UNRELEASED; urgency=low
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Switch back to B-D on libqt4-dev and reenable the tests.
+    Also add README.source to let people know how to bootstrap qtchooser.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 24 May 2013 13:54:57 -0300
 
 qtchooser (31-g980c64c-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index a6095ff..5d3d560 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
 Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Timo Jyrinki <timo at debian.org>,
   Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Build-Depends: debhelper (>= 9)
+Build-Depends: debhelper (>= 9), libqt4-dev
 Standards-Version: 3.9.4
 Homepage: https://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtchooser.git
diff --git a/debian/rules b/debian/rules
index e11c08d..e5dc733 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,3 @@ override_dh_auto_build:
 
 override_dh_auto_install:
 	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser
-
-override_dh_auto_test:
-# Do not build test just for one upload.

-- 
qtchooser packaging