[SCM] qttools packaging branch, experimental, updated. debian/5.9.2-2-2-g3a97d95

Dmitry Shachnev mitya57 at moszumanska.debian.org
Fri Oct 20 17:51:34 UTC 2017


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

The following commit has been merged in the experimental branch:
commit 3a97d952452adc31924e4911448ce824c6e5a038
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 20 20:50:19 2017 +0300

    Move Qt5LinguistTools*.cmake from qttools5-dev-tools to qttools5-dev.
---
 debian/changelog                     | 2 ++
 debian/control                       | 2 ++
 debian/qttools5-dev-tools.install.in | 3 ---
 debian/qttools5-dev.install          | 3 +++
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfc9ec4..676d859 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 qttools-opensource-src (5.9.2-3) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Move Qt5LinguistTools*.cmake from qttools5-dev-tools to qttools5-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 20 Oct 2017 20:49:30 +0300
 
diff --git a/debian/control b/debian/control
index 4fa242d..e264ea5 100644
--- a/debian/control
+++ b/debian/control
@@ -79,6 +79,8 @@ Depends: libqt5designer5 (= ${binary:Version}),
          qtbase5-dev,
          qttools5-dev-tools (= ${binary:Version}),
          ${misc:Depends}
+Breaks: qttools5-dev-tools (<< 5.9.2-3~)
+Replaces: qttools5-dev-tools (<< 5.9.2-3~)
 Description: Qt 5 tools development files
  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.in b/debian/qttools5-dev-tools.install.in
index 4d355ff..b651167 100644
--- a/debian/qttools5-dev-tools.install.in
+++ b/debian/qttools5-dev-tools.install.in
@@ -1,6 +1,3 @@
-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 84520f0..0ea4cb5 100644
--- a/debian/qttools5-dev.install
+++ b/debian/qttools5-dev.install
@@ -132,6 +132,9 @@ 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