[SCM] qtchooser packaging branch, master, updated. debian/64-ga1b6736-1-5-g3242dc7

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 27bca3705f351c2b335ec0b3448ff6cc8ce24ba6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 20 14:29:32 2017 +0300

    Revert "Split the files in /usr/bin into a separate package qtchooser-bin."
    
    This reverts commit 2afd50664f0ba87a94a44b235b4e236de033ae9f.
---
 debian/changelog                                   |  4 ++++
 debian/control                                     | 26 ++--------------------
 debian/qtchooser-bin.install                       |  1 -
 debian/qtchooser-bin.lintian-overrides             |  1 -
 debian/qtchooser.lintian-overrides                 |  1 +
 .../{qtchooser-bin.manpages => qtchooser.manpages} |  0
 debian/rules                                       |  4 +---
 7 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bda574e..8d830f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtchooser (64-ga1b6736-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Revert the split done in the previous upload. It is not needed with
+    our new Qt cross-building approach when we call build architecture
+    versions of qmake and other Qt tools.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 14:25:24 +0300
 
diff --git a/debian/control b/debian/control
index 5c6bd42..6f7ff71 100644
--- a/debian/control
+++ b/debian/control
@@ -13,38 +13,16 @@ 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-bin
+Package: qtchooser
 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. Do not
- install this package directly, use qtchooser instead.
-
-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 versions — configuration files
+Description: Wrapper to select between Qt development binary versions
  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 is the main Qt Chooser package. After installing it, you should be
- able to use executables like /usr/bin/qmake and others. Pass ‘-qt4’ or
- ‘-qt5’ flag to these executables, or export QT_SELECT=4 or QT_SELECT=5
- environment variable, to explicitly select the Qt version.
diff --git a/debian/qtchooser-bin.install b/debian/qtchooser-bin.install
deleted file mode 100644
index 1df36c6..0000000
--- a/debian/qtchooser-bin.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/*
diff --git a/debian/qtchooser-bin.lintian-overrides b/debian/qtchooser-bin.lintian-overrides
deleted file mode 100644
index 049dbc6..0000000
--- a/debian/qtchooser-bin.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-qtchooser-bin binary: binary-without-manpage
diff --git a/debian/qtchooser.lintian-overrides b/debian/qtchooser.lintian-overrides
new file mode 100644
index 0000000..5beb78d
--- /dev/null
+++ b/debian/qtchooser.lintian-overrides
@@ -0,0 +1 @@
+qtchooser: binary-without-manpage
diff --git a/debian/qtchooser-bin.manpages b/debian/qtchooser.manpages
similarity index 100%
rename from debian/qtchooser-bin.manpages
rename to debian/qtchooser.manpages
diff --git a/debian/rules b/debian/rules
index 7988b5a..8f2f275 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,10 +15,8 @@ override_dh_auto_build:
 	make QTCHOOSER_GLOBAL_DIR=/usr/share:/usr/lib/$(DEB_HOST_MULTIARCH):/usr/lib/$(DEB_HOST_MULTIARCH)/qt-default CXX=$(CXX)
 
 override_dh_auto_install:
-	make install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	make install INSTALL_ROOT=$(CURDIR)/debian/qtchooser
 
-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