[SCM] qttools packaging branch, master, updated. debian/5.3.2-2-2-g7286749

Dmitry Shachnev mitya57-guest at moszumanska.debian.org
Wed Sep 24 17:00:44 UTC 2014


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

The following commit has been merged in the master branch:
commit 7286749ee2c810f4858723595943ee87ce5f1428
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Sep 24 21:00:34 2014 +0400

    Move CMake files for example Designer plugins to qttools5-examples.
---
 debian/changelog                 | 2 ++
 debian/control                   | 4 ++--
 debian/qttools5-dev.install      | 4 ----
 debian/qttools5-examples.install | 4 ++++
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 077eb88..70bb1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qttools-opensource-src (5.3.2-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Move CMake files for example Designer plugins to qttools5-examples.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 24 Sep 2014 20:59:28 +0400
 
diff --git a/debian/control b/debian/control
index f6fe252..5243579 100644
--- a/debian/control
+++ b/debian/control
@@ -145,8 +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~)
+Breaks: qttools5-dev-tools (<< 5.3.1-2~), qttools5-dev (<< 5.3.2-3~)
+Replaces: qttools5-dev-tools (<< 5.3.1-2~), qttools5-dev (<< 5.3.2-3~)
 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.install b/debian/qttools5-dev.install
index 72f61ae..e9d11fe 100644
--- a/debian/qttools5-dev.install
+++ b/debian/qttools5-dev.install
@@ -123,12 +123,8 @@ usr/include/*/qt5/QtUiTools/qtuitoolsversion.h
 usr/include/*/qt5/QtUiTools/quiloader.h
 usr/lib/*/cmake/Qt5Designer/Qt5DesignerConfig.cmake
 usr/lib/*/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake
-usr/lib/*/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
-usr/lib/*/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
 usr/lib/*/cmake/Qt5Designer/Qt5Designer_QQuickWidgetPlugin.cmake
 usr/lib/*/cmake/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
-usr/lib/*/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
-usr/lib/*/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
 usr/lib/*/cmake/Qt5Help/Qt5HelpConfig.cmake
 usr/lib/*/cmake/Qt5Help/Qt5HelpConfigExtras.cmake
 usr/lib/*/cmake/Qt5Help/Qt5HelpConfigVersion.cmake
diff --git a/debian/qttools5-examples.install b/debian/qttools5-examples.install
index 2eee8e1..9b9be9f 100644
--- a/debian/qttools5-examples.install
+++ b/debian/qttools5-examples.install
@@ -1,3 +1,7 @@
+usr/lib/*/cmake/Qt5Designer/Qt5Designer_AnalogClockPlugin.cmake
+usr/lib/*/cmake/Qt5Designer/Qt5Designer_MultiPageWidgetPlugin.cmake
+usr/lib/*/cmake/Qt5Designer/Qt5Designer_TicTacToePlugin.cmake
+usr/lib/*/cmake/Qt5Designer/Qt5Designer_WorldTimeClockPlugin.cmake
 usr/lib/*/qt5/examples/assistant/
 usr/lib/*/qt5/examples/designer/
 usr/lib/*/qt5/examples/help/

-- 
qttools packaging



More information about the pkg-kde-commits mailing list