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

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 4284daf8b8c8f0ccdb3c5f02d4e14073d16aebb7
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Jun 1 13:46:52 2016 +0300

    Merge README.source into README.Debian.
    
    The former file is for another purpose (like how to get the source tarball),
    information about bootstrapping is better put into the latter file.
---
 debian/README.Debian | 9 +++++++++
 debian/README.source | 8 --------
 debian/changelog     | 2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 0cca913..acc483a 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -12,3 +12,12 @@ in three additional directories:
   points to Qt4. In this way the Qt4 packages already in the archive should not
   FTBFS when we introduce qtchooser in unstable. Exporting QT_SELECT=qt4 or
   build-depending on qt4-default is recommended.
+
+
+= Bootstrapping qtchooser.
+
+qtchooser build-depends on qtbase5-dev, but qtchooser itself is needed
+in order to run qmake, so creating a circular build dependency.
+
+Actually qtchooser only needs Qt5 for building its tests. If you need to
+bootstrap it, build it with either stage1 or nocheck build profile.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index bcba979..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,8 +0,0 @@
-= Bootstrapping qtchooser.
-
-qtchooser build-depends on qtbase5-dev, but qtchooser itself it's needed
-in order to run qmake, so creating a circular build dependency.
-
-Actually qtchooser only needs Qt5 for building it's tests. If you need to
-bootstrap it, simply remove qtbase5-dev as a build dependency and override
-dh_auto_test in debian/rules or add nocheck to DEB_BUILD_OPTIONS.
diff --git a/debian/changelog b/debian/changelog
index 3575fb6..a1709b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 qtchooser (58-gfab25f1-2) UNRELEASED; urgency=medium
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
-  * Reintroduce README.source with updated information for porters.
+  * Add information about bootstrapping to README.Debian.
 
   [ Dmitry Shachnev ]
   * Disable qtbase5-dev build-dependency on stage1 profile to break the

-- 
qtchooser packaging