[SCM] qtchooser packaging branch, master, updated. debian/58-gfab25f1-1-3-ge2116ce

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit e2116ce53bf7224d268d1d47586b88e37c6f76d1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue May 31 15:12:14 2016 +0300

    Disable qtbase5-dev build-dependency on stage1 build profile.
    
    To break the dependency loop between qtbase-opensource-src and qtchooser.
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 debian/rules     | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 72f7c34..9e18c6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ qtchooser (58-gfab25f1-2) UNRELEASED; urgency=medium
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Reintroduce README.source with updated information for porters.
 
+  [ Dmitry Shachnev ]
+  * Disable qtbase5-dev build-dependency on stage1 profile to break the
+    dependency loop between qtbase-opensource-src and qtchooser.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 30 May 2016 15:30:59 -0300
 
 qtchooser (58-gfab25f1-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 3bb8b24..83086de 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ 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>,
            Dmitry Shachnev <mitya57 at debian.org>
-Build-Depends: debhelper (>= 9), qtbase5-dev
+Build-Depends: debhelper (>= 9.20141010), qtbase5-dev <!stage1> <!nocheck>
 Standards-Version: 3.9.7
 Homepage: https://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtchooser.git
diff --git a/debian/rules b/debian/rules
index 7348cb7..aae4079 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,8 @@ override_dh_auto_install:
 	done
 
 override_dh_auto_test:
+ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	make check QMAKE=/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/qmake
 endif
+endif

-- 
qtchooser packaging