[SCM] qttools packaging branch, master, updated. debian/5.9.2-4-2-g1216377

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 121637789fc8565a9e2d6f703582905b98d1b9cb
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 16 14:20:32 2017 +0300

    Split Assistant into its own package, qt5-assistant.
    
    Closes: #854123.
---
 debian/changelog                     |  2 ++
 debian/control                       | 22 ++++++++++++++++++++--
 debian/qt5-assistant.install         |  2 ++
 debian/qttools5-dev-tools.install.in |  2 --
 debian/rules                         |  2 +-
 5 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 044001a..340fd68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qttools-opensource-src (5.9.2-5) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Split Assistant into its own package, qt5-assistant (closes: #854123).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 16 Dec 2017 14:08:20 +0300
 
diff --git a/debian/control b/debian/control
index 738baae..6d5d2cb 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,11 @@ Package: qttools5-dev-tools
 Architecture: any
 Multi-Arch: foreign
 Section: devel
-Depends: libqt5sql5-sqlite, qtchooser, ${misc:Depends}, ${shlibs:Depends}
+Depends: libqt5sql5-sqlite,
+         qt5-assistant (= ${binary:Version}),
+         qtchooser,
+         ${misc:Depends},
+         ${shlibs:Depends}
 Breaks: qtbase5-dev-tools (<< 5.6.0~), qttools5-dev (<< 5.5.0-2~)
 Replaces: qtbase5-dev-tools (<< 5.6.0~), qttools5-dev (<< 5.5.0-2~)
 Description: Qt 5 development tools
@@ -116,12 +120,26 @@ Description: Qt 5 development tools
  This package contains a set of applications to browse the documentation,
  translate applications, generate help files and other stuff that
  helps in Qt development. These tools are among others:
-  * assistant
   * designer
   * linguist
   * pixeltool
   * qdbusviewer
 
+Package: qt5-assistant
+Architecture: any
+Multi-Arch: foreign
+Section: devel
+Depends: libqt5sql5-sqlite, qtchooser, ${misc:Depends}, ${shlibs:Depends}
+Suggests: qt5-doc
+Breaks: qttools5-dev-tools (<< 5.9.2-5~)
+Replaces: qttools5-dev-tools (<< 5.9.2-5~)
+Description: Qt 5 Assistant
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ Qt Assistant is a tool for viewing on-line documentation in Qt help file
+ format.
+
 Package: qttools5-examples
 Architecture: any
 Multi-Arch: same
diff --git a/debian/qt5-assistant.install b/debian/qt5-assistant.install
new file mode 100644
index 0000000..b264982
--- /dev/null
+++ b/debian/qt5-assistant.install
@@ -0,0 +1,2 @@
+usr/lib/qt5/bin/assistant
+debian/desktop/assistant-qt5.desktop usr/share/applications/
diff --git a/debian/qttools5-dev-tools.install.in b/debian/qttools5-dev-tools.install.in
index b651167..b171926 100644
--- a/debian/qttools5-dev-tools.install.in
+++ b/debian/qttools5-dev-tools.install.in
@@ -1,4 +1,3 @@
-usr/lib/qt5/bin/assistant
 usr/lib/qt5/bin/designer
 usr/lib/qt5/bin/lconvert
 usr/lib/qt5/bin/linguist
@@ -29,6 +28,5 @@ usr/share/qt5/phrasebooks/polish.qph
 usr/share/qt5/phrasebooks/russian.qph
 usr/share/qt5/phrasebooks/spanish.qph
 usr/share/qt5/phrasebooks/swedish.qph
-debian/desktop/assistant-qt5.desktop usr/share/applications/
 debian/desktop/designer-qt5.desktop usr/share/applications/
 debian/desktop/linguist-qt5.desktop usr/share/applications/
diff --git a/debian/rules b/debian/rules
index 8423d97..ed978d3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ endif
 	dh_install --fail-missing
 
 	install -D -p -m0644 src/assistant/assistant/images/assistant-128.png \
-		debian/qttools5-dev-tools/usr/share/pixmaps/assistant-qt5.png
+		debian/qt5-assistant/usr/share/pixmaps/assistant-qt5.png
 	install -D -p -m0644 src/designer/src/designer/images/designer.png \
 		debian/qttools5-dev-tools/usr/share/pixmaps/designer-qt5.png
 	install -D -p -m0644 src/linguist/linguist/images/icons/linguist-128-32.png \

-- 
qttools packaging