[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.5.1-3-26-gce74a8e

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 412b8fc36b56844752273a4d209292e20db598d6
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Jan 5 19:52:30 2016 +0300

    Split the qmltooling plugins into their own qt5-qmltooling-plugins package.
---
 debian/changelog                      |  3 +--
 debian/control                        | 14 ++++++++++++++
 debian/libqt5qml5.install             |  1 -
 debian/qt5-qmltooling-plugins.install |  1 +
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b10221..cf9e0dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,6 @@ qtdeclarative-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
   * Bump qtdeclarative-abi to 5-6-0.
   * Disable building documentation pending fixing Qt5.6 qdoc issues.
   * Update watch file to use developemnt_relesaes. (Change back after release)
-  * Update libqt5qml5.install to install all libqmldbg plugins.
-    - Remove missing libqmldbg_qtquick2.so
   * Install core QtQml qml metadata with libqt5qml5 package.
   * Update qtdeclarative5-private-dev.install.
 
@@ -25,6 +23,7 @@ qtdeclarative-opensource-src (5.6.0~beta-1) UNRELEASED; urgency=medium
   * Update qtdeclarative5-dev.install.
   * Do not hardcode abi package name in libqt5quickwidgets5.lintian-overrides,
     so that it still applies.
+  * Split the qmltooling plugins into their own qt5-qmltooling-plugins package.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 28 Dec 2015 17:05:50 -0800
 
diff --git a/debian/control b/debian/control
index 02126f2..936a8a2 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: libgl1-mesa-glx
+Suggests: qt5-qmltooling-plugins
 Description: Qt 5 QML module
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -83,6 +84,19 @@ Description: Qt 5 Quick Widgets library
  .
  This package contains the Qt Quick Widgets library for QtDeclarative module.
 
+Package: qt5-qmltooling-plugins
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: libqt5qml5 (<< 5.6.0~beta~)
+Replaces: libqt5qml5 (<< 5.6.0~beta~)
+Description: Qt 5 qmltooling plugins
+ 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 qmltooling plugins.
+
 Package: qml-module-qt-labs-folderlistmodel
 Architecture: any
 Multi-Arch: same
diff --git a/debian/libqt5qml5.install b/debian/libqt5qml5.install
index 8815953..40bf67c 100644
--- a/debian/libqt5qml5.install
+++ b/debian/libqt5qml5.install
@@ -1,5 +1,4 @@
 usr/lib/*/libQt5Qml.so.*
-usr/lib/*/qt5/plugins/qmltooling/libqmldbg_*.so
 usr/lib/*/qt5/qml/QtQml/plugins.qmltypes
 usr/lib/*/qt5/qml/QtQml/qmldir
 usr/lib/*/qt5/qml/builtins.qmltypes
diff --git a/debian/qt5-qmltooling-plugins.install b/debian/qt5-qmltooling-plugins.install
new file mode 100644
index 0000000..a4d1a4e
--- /dev/null
+++ b/debian/qt5-qmltooling-plugins.install
@@ -0,0 +1 @@
+usr/lib/*/qt5/plugins/qmltooling/libqmldbg_*.so

-- 
qtdeclarative packaging