[SCM] qttools packaging branch, master, updated. debian/5.4.2-3-2-gaaa0e8d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit aaa0e8d563de1fff7c698f3d21e9330e9427144e
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 28 22:41:31 2015 -0300

    Revert "Move Qt5LinguistTools cmake files from -dev to -dev-tools package."
    
    This reverts commit 4b6cf1aeba10c8d449b77da97213bb3e309a5ae5.
    
    The change went to experimental as it should.
---
 debian/changelog                  | 7 -------
 debian/control                    | 4 ++--
 debian/qttools5-dev-tools.install | 3 ---
 debian/qttools5-dev.install       | 3 +++
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f279ae3..6e71cda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,3 @@
-qttools-opensource-src (5.4.2-4) 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.4.2-3) unstable; urgency=medium
 
   * Update symbols files with buildds' logs.
diff --git a/debian/control b/debian/control
index 1f7d76a..bf91745 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~), qttools5-dev (<< 5.4.2-4~)
-Replaces: qttools5-examples (<< 5.3.0-4~), qttools5-dev (<< 5.4.2-4~)
+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 b027c2a..a0923e1 100644
--- a/debian/qttools5-dev-tools.install
+++ b/debian/qttools5-dev-tools.install
@@ -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 581c768..53ffb38 100644
--- a/debian/qttools5-dev.install
+++ b/debian/qttools5-dev.install
@@ -126,6 +126,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/Qt5UiTools/Qt5UiToolsConfig.cmake
 usr/lib/*/cmake/Qt5UiTools/Qt5UiToolsConfigVersion.cmake
 usr/lib/*/libQt5CLucene.prl

-- 
qttools packaging