[SCM] qttools packaging branch, master, updated. debian/5.3.0-3-4-g3b07f80
Lisandro Damián Nicanor Pérez
lisandro at moszumanska.debian.org
Fri Jun 20 23:41:22 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=3b07f80
The following commit has been merged in the master branch:
commit 3b07f80d70dd04e715192e610c409c7126c982aa
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Fri Jun 20 20:40:54 2014 -0300
Install designer plugins alongside it.
Closes: #749336.
---
debian/changelog | 2 ++
debian/control | 2 ++
debian/qttools5-dev-tools.install | 6 ++++++
debian/qttools5-examples.install | 6 ------
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 35b9686..8b2f7f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qttools-opensource-src (5.3.0-4) UNRELEASED; urgency=medium
[ Lisandro Damián Nicanor Pérez Meyer ]
* Update symbols files with buildds' logs.
+ * Install designer plugins alongside designer itself and not with the
+ examples (Closes: #749336).
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 10 Jun 2014 12:03:45 +0400
diff --git a/debian/control b/debian/control
index c4f0825..d97ec07 100644
--- a/debian/control
+++ b/debian/control
@@ -124,6 +124,8 @@ Architecture: any
Section: devel
Depends: qtchooser, ${misc:Depends}, ${shlibs:Depends}
Recommends: libqt5sql5-sqlite
+Breaks: qttools5-examples (<< 5.3.0-4~)
+Replaces: qttools5-examples (<< 5.3.0-4~)
Description: Qt 5 development tools
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 472b61b..ed0ff79 100644
--- a/debian/qttools5-dev-tools.install
+++ b/debian/qttools5-dev-tools.install
@@ -11,6 +11,12 @@ 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 414a5ac..8e7ae94 100644
--- a/debian/qttools5-examples.install
+++ b/debian/qttools5-examples.install
@@ -3,9 +3,3 @@ 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/libqquickwidget.so
-usr/lib/*/qt5/plugins/designer/libqwebview.so
-usr/lib/*/qt5/plugins/designer/libtaskmenuextension.so
-usr/lib/*/qt5/plugins/designer/libworldtimeclockplugin.so
--
qttools packaging
More information about the pkg-kde-commits
mailing list