[SCM] qttools packaging branch, master, updated. debian/5.1.1-1-4-gb695131

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 86865a3ce580a9d5968293781dd4e6f634a3b10b
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Oct 1 10:06:48 2013 -0300

    Call make qmake_all after building the first stuff.
    
    We now don't need to recursively build-depend on us.
---
 debian/changelog |    2 ++
 debian/control   |    5 ++---
 debian/rules     |    1 +
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cab036f..53585c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ qttools-opensource-src (5.1.1-2) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Add README.source explaining how to bootstrap this package.
+  * Call 'make qmake_all' after building qttools, this way we can build the
+    arch-independent stuff without the need to recursively build-depend on us.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 27 Sep 2013 09:36:13 -0300
 
diff --git a/debian/control b/debian/control
index 04ccb43..b58f751 100644
--- a/debian/control
+++ b/debian/control
@@ -10,11 +10,10 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Felix Geyer <fgeyer at debian.org>,
            Timo Jyrinki <timo at debian.org>
 Build-Depends: debhelper (>= 9),
+               libqt5sql5-sqlite (>= 5.1.1~),
                pkg-kde-tools,
                qtbase5-private-dev (>= 5.1.1~),
-               zlib1g-dev,
-Build-Depends-Indep: libqt5sql5-sqlite (>= 5.1.1~),
-                     qttools5-dev-tools (>= 5.1.1~)
+               zlib1g-dev
 Standards-Version: 3.9.4
 Homepage: http://qt-project.org/
 Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qttools.git
diff --git a/debian/rules b/debian/rules
index 611b450..482bedc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,6 +23,7 @@ override_dh_auto_build-arch:
 	# needed for building the docs are built before calling them.
 	# If there's a better way, do not heasitate to tell us.
 	dh_auto_build
+	make qmake_all
 
 override_dh_auto_build-indep:
 	dh_auto_build -Smakefile -- docs

-- 
qttools packaging