[SCM] qtchooser packaging branch, master, updated. debian/63-g13a3d08-1-2-g2afd506

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 2afd50664f0ba87a94a44b235b4e236de033ae9f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Aug 25 16:30:39 2017 +0300

    Split the files in /usr/bin into a separate package qtchooser-bin.
    
    Make the main qtchooser package Multi-Arch: same.
    
    Thanks to Helmut Grohne for the suggestions.
    Closes: #781226.
---
 debian/changelog                                   |  3 +++
 debian/control                                     | 22 ++++++++++++++++++++--
 debian/qtchooser-bin.install                       |  1 +
 debian/qtchooser-bin.lintian-overrides             |  1 +
 .../{qtchooser.manpages => qtchooser-bin.manpages} |  0
 debian/qtchooser.lintian-overrides                 |  1 -
 debian/rules                                       |  4 +++-
 7 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b3b2972..9746592 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtchooser (64-ga1b6736-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream git snapshot.
+  * Split the files in /usr/bin into a separate package qtchooser-bin.
+    Make the main qtchooser package Multi-Arch: same. (Closes: #781226).
+    Thanks to Helmut Grohne for the suggestions.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 25 Aug 2017 16:10:17 +0300
 
diff --git a/debian/control b/debian/control
index 6f7ff71..4ca21e6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,16 +13,34 @@ Homepage: https://qt-project.org/
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtchooser.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtchooser.git
 
-Package: qtchooser
+Package: qtchooser-bin
 Architecture: any
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtchooser (<< 64-ga1b6736-1~)
+Replaces: qtchooser (<< 64-ga1b6736-1~)
+Description: wrapper to select between Qt versions — binary files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ The Qt Chooser provides a wrapper to switch between versions of Qt
+ development binaries when multiple versions like 4 and 5 are installed
+ or local Qt builds are to be used.
+ .
+ This package contains the executable binary files of Qt Chooser.
+
+Package: qtchooser
+Architecture: any
+Multi-Arch: same
+Depends: qtchooser-bin (= ${binary:Version}), ${misc:Depends}
 Breaks: libqt5core5a (<< 5.5.1+dfsg-17~), libqtcore4 (<< 4:4.8.7+dfsg-7~)
 Replaces: libqt5core5a (<< 5.5.1+dfsg-17~), libqtcore4 (<< 4:4.8.7+dfsg-7~)
-Description: Wrapper to select between Qt development binary versions
+Description: wrapper to select between Qt versions — configuration files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
  .
  The Qt Chooser provides a wrapper to switch between versions of Qt
  development binaries when multiple versions like 4 and 5 are installed
  or local Qt builds are to be used.
+ .
+ This package contains the configuration files for Qt 4 and Qt 5.
diff --git a/debian/qtchooser-bin.install b/debian/qtchooser-bin.install
new file mode 100644
index 0000000..1df36c6
--- /dev/null
+++ b/debian/qtchooser-bin.install
@@ -0,0 +1 @@
+usr/bin/*
diff --git a/debian/qtchooser-bin.lintian-overrides b/debian/qtchooser-bin.lintian-overrides
new file mode 100644
index 0000000..049dbc6
--- /dev/null
+++ b/debian/qtchooser-bin.lintian-overrides
@@ -0,0 +1 @@
+qtchooser-bin binary: binary-without-manpage
diff --git a/debian/qtchooser.manpages b/debian/qtchooser-bin.manpages
similarity index 100%
rename from debian/qtchooser.manpages
rename to debian/qtchooser-bin.manpages
diff --git a/debian/qtchooser.lintian-overrides b/debian/qtchooser.lintian-overrides
deleted file mode 100644
index 5beb78d..0000000
--- a/debian/qtchooser.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-qtchooser: binary-without-manpage
diff --git a/debian/rules b/debian/rules
index 248cbc6..fb69d0e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,10 @@ override_dh_auto_build:
 	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default
 
 override_dh_auto_install:
-	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser
+	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
 
+override_dh_install:
+	dh_install
 	mkdir -p $(CURDIR)/debian/qtchooser/usr/share/qtchooser
 	mkdir -p $(CURDIR)/debian/qtchooser/usr/lib/$(DEB_HOST_MULTIARCH)/qtchooser
 

-- 
qtchooser packaging