[SCM] qttools packaging branch, kubuntu_unstable, updated. debian/5.5.0-1-1-g710169e
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Tue Sep 8 16:16:57 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qttools.git;a=commitdiff;h=710169e
The following commit has been merged in the kubuntu_unstable branch:
commit 710169e2c42128e559f4a9db1b477b127958838f
Author: Felix Geyer <fgeyer at debian.org>
Date: Thu Aug 27 13:29:52 2015 +0200
Move Qt5LinguistTools cmake files from -dev to -dev-tools package.
Closes: #793347
---
debian/changelog | 7 +++++++
debian/control | 4 ++--
debian/qttools5-dev-tools.install | 3 +++
debian/qttools5-dev.install | 3 ---
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e642bb2..ccf45c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qttools-opensource-src (5.5.0-2) UNRELEASED; urgency=medium
+
+ * Move Qt5LinguistTools cmake files from -dev to -dev-tools package.
+ (Closes: #793347)
+
+ -- Felix Geyer <fgeyer at debian.org> Thu, 27 Aug 2015 13:26:44 +0200
+
qttools-opensource-src (5.5.0-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index efec84b..78b311b 100644
--- a/debian/control
+++ b/debian/control
@@ -123,8 +123,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~)
+Breaks: qttools5-examples (<< 5.3.0-4~), qttools5-dev (<< 5.5.0-2~)
+Replaces: qttools5-examples (<< 5.3.0-4~), qttools5-dev (<< 5.5.0-2~)
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 611dc0d..3afea76 100644
--- a/debian/qttools5-dev-tools.install
+++ b/debian/qttools5-dev-tools.install
@@ -1,3 +1,6 @@
+usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
+usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
+usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
usr/lib/*/qt5/bin/assistant
usr/lib/*/qt5/bin/designer
usr/lib/*/qt5/bin/lconvert
diff --git a/debian/qttools5-dev.install b/debian/qttools5-dev.install
index 076697b..8bf491b 100644
--- a/debian/qttools5-dev.install
+++ b/debian/qttools5-dev.install
@@ -135,9 +135,6 @@ usr/lib/*/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake
usr/lib/*/cmake/Qt5Help/Qt5HelpConfig.cmake
usr/lib/*/cmake/Qt5Help/Qt5HelpConfigExtras.cmake
usr/lib/*/cmake/Qt5Help/Qt5HelpConfigVersion.cmake
-usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake
-usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
-usr/lib/*/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
usr/lib/*/cmake/Qt5UiPlugin/Qt5UiPluginConfig.cmake
usr/lib/*/cmake/Qt5UiPlugin/Qt5UiPluginConfigVersion.cmake
usr/lib/*/cmake/Qt5UiTools/Qt5UiToolsConfig.cmake
--
qttools packaging
More information about the pkg-kde-commits
mailing list