[SCM] qtbase packaging branch, master, updated. debian/5.9.1+dfsg-11-3-g97f8c6e

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 97f8c6ec1373e9abcb21c69d905781a05f433174
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Oct 1 20:28:43 2017 +0300

    Split qmake binary into a new binary package, qt5-qmake-bin.
    
    Make the new package Multi-Arch: foreign, to make sure that a proper
    version of qmake gets installed for cross builds.
    
    Closes: #876861.
---
 debian/changelog                                      |  3 +++
 debian/control                                        | 19 ++++++++++++++++++-
 debian/{qt5-qmake.install => qt5-qmake-bin.install}   |  1 -
 debian/{qt5-qmake.manpages => qt5-qmake-bin.manpages} |  0
 debian/qt5-qmake.install                              |  1 -
 5 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 07bb8c7..787be17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ qtbase-opensource-src (5.9.1+dfsg-12) UNRELEASED; urgency=medium
   [ Dmitry Shachnev ]
   * Use the linux-g++ mkspec on all Linux architectures. We do not need
     the -m64 compiler flag which linux-g++-64 adds.
+  * Split qmake binary into a new binary package, qt5-qmake-bin.
+    Make the new package Multi-Arch: foreign, to make sure that a proper
+    version of qmake gets installed for cross builds (closes: #876861).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Oct 2017 18:05:54 +0300
 
diff --git a/debian/control b/debian/control
index fb23d5d..7f90af9 100644
--- a/debian/control
+++ b/debian/control
@@ -388,11 +388,28 @@ Description: Qt 5 base development programs
  applications, such as moc, qdbuscpp2xml, qdbusxml2cpp, rcc,
  syncqt and uic.
 
+Package: qt5-qmake-bin
+Architecture: any
+Multi-Arch: foreign
+Section: devel
+Depends: ${misc:Depends}
+Breaks: qt5-qmake (<< 5.9.1+dfsg-12~)
+Replaces: qt5-qmake (<< 5.9.1+dfsg-12~)
+Description: Qt 5 qmake Makefile generator tool — binary file
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the binary file for qmake buildsystem. Do not
+ install this package directly, use qt5-qmake instead.
+
 Package: qt5-qmake
 Architecture: any
 Multi-Arch: same
 Section: devel
-Depends: qtchooser (>= 55-gc9562a1-1~), ${misc:Depends}, ${shlibs:Depends}
+Depends: qt5-qmake-bin (= ${binary:Version}),
+         qtchooser (>= 55-gc9562a1-1~),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Qt 5 qmake Makefile generator tool
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake-bin.install
similarity index 51%
copy from debian/qt5-qmake.install
copy to debian/qt5-qmake-bin.install
index d771d6f..9e292b0 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake-bin.install
@@ -1,2 +1 @@
 usr/lib/*/qt5/bin/qmake
-usr/lib/*/qt5/mkspecs/
diff --git a/debian/qt5-qmake.manpages b/debian/qt5-qmake-bin.manpages
similarity index 100%
rename from debian/qt5-qmake.manpages
rename to debian/qt5-qmake-bin.manpages
diff --git a/debian/qt5-qmake.install b/debian/qt5-qmake.install
index d771d6f..7e73083 100644
--- a/debian/qt5-qmake.install
+++ b/debian/qt5-qmake.install
@@ -1,2 +1 @@
-usr/lib/*/qt5/bin/qmake
 usr/lib/*/qt5/mkspecs/

-- 
qtbase packaging