[SCM] qttools packaging branch, master, updated. debian/5.3.1-1-2-g6cbc690

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 6cbc6900e8b0d7729b6fb7596ba6807a3be779c9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sun Jul 13 11:22:50 2014 +0400

    Really fix bug #749336.
    
    Move designer plugins that are built from examples/designer back
    to qttools5-examples package. Only plugins that are built from
    src/designer/src/plugins remain in qttools5-dev-tools package.
---
 debian/changelog                  | 5 +++++
 debian/control                    | 2 ++
 debian/qttools5-dev-tools.install | 4 ----
 debian/qttools5-examples.install  | 4 ++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bb9ced7..262bc64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 qttools-opensource-src (5.3.1-2) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Move designer plugins that are built from examples/designer back
+    to qttools5-examples package. Only plugins that are built from
+    src/designer/src/plugins remain in qttools5-dev-tools package
+    (really closes: #749336).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 13 Jul 2014 11:17:54 +0400
 
diff --git a/debian/control b/debian/control
index a5b4313..9661618 100644
--- a/debian/control
+++ b/debian/control
@@ -145,6 +145,8 @@ Multi-Arch: same
 Section: x11
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: qttools5-dev-tools (<< 5.3.1-2~)
+Replaces: qttools5-dev-tools (<< 5.3.1-2~)
 Description: Qt 5 tools examples
  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/qttools5-dev-tools.install b/debian/qttools5-dev-tools.install
index ed0ff79..a0923e1 100644
--- a/debian/qttools5-dev-tools.install
+++ b/debian/qttools5-dev-tools.install
@@ -11,12 +11,8 @@ usr/lib/*/qt5/bin/qhelpconverter
 usr/lib/*/qt5/bin/qhelpgenerator
 usr/lib/*/qt5/bin/qtdiag
 usr/lib/*/qt5/bin/qtpaths
-usr/lib/*/qt5/plugins/designer/libcontainerextension.so
-usr/lib/*/qt5/plugins/designer/libcustomwidgetplugin.so
 usr/lib/*/qt5/plugins/designer/libqquickwidget.so
 usr/lib/*/qt5/plugins/designer/libqwebview.so
-usr/lib/*/qt5/plugins/designer/libtaskmenuextension.so
-usr/lib/*/qt5/plugins/designer/libworldtimeclockplugin.so
 usr/share/qt5/phrasebooks/danish.qph
 usr/share/qt5/phrasebooks/dutch.qph
 usr/share/qt5/phrasebooks/finnish.qph
diff --git a/debian/qttools5-examples.install b/debian/qttools5-examples.install
index 8e7ae94..2eee8e1 100644
--- a/debian/qttools5-examples.install
+++ b/debian/qttools5-examples.install
@@ -3,3 +3,7 @@ usr/lib/*/qt5/examples/designer/
 usr/lib/*/qt5/examples/help/
 usr/lib/*/qt5/examples/linguist/
 usr/lib/*/qt5/examples/uitools/
+usr/lib/*/qt5/plugins/designer/libcontainerextension.so
+usr/lib/*/qt5/plugins/designer/libcustomwidgetplugin.so
+usr/lib/*/qt5/plugins/designer/libtaskmenuextension.so
+usr/lib/*/qt5/plugins/designer/libworldtimeclockplugin.so

-- 
qttools packaging