[SCM] qttools packaging branch, experimental, updated. debian/5.2.0-2-3-g06f542f

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit b55e020de636af91b911f3d3c412939146337671
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 21 12:04:10 2013 +0100

    install private qmake stuff in qttools5-private-dev
    
    ... not in qttools5-dev
---
 debian/changelog                    | 3 +++
 debian/control                      | 2 ++
 debian/qttools5-dev.install         | 5 -----
 debian/qttools5-private-dev.install | 5 +++++
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0eaa30..3e8284f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qttools-opensource-src (5.2.0-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Install the private qmake stuff in qttools5-private-dev, not in
+    qttools5-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 21 Dec 2013 12:00:57 +0100
 
diff --git a/debian/control b/debian/control
index 0f94b27..8fb6e3d 100644
--- a/debian/control
+++ b/debian/control
@@ -102,6 +102,8 @@ Architecture: any
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qttools5-dev (= ${binary:Version}), ${misc:Depends}
+Breaks: qttools5-dev (<< 5.2.0-3~)
+Replaces: qttools5-dev (<< 5.2.0-3~)
 Description: Qt 5 tools private 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.install b/debian/qttools5-dev.install
index 67a8856..c3820a4 100644
--- a/debian/qttools5-dev.install
+++ b/debian/qttools5-dev.install
@@ -145,11 +145,6 @@ usr/lib/*/pkgconfig/Qt5Designer.pc
 usr/lib/*/pkgconfig/Qt5DesignerComponents.pc
 usr/lib/*/pkgconfig/Qt5Help.pc
 usr/lib/*/pkgconfig/Qt5UiTools.pc
-usr/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_designer.pri
-usr/share/qt5/mkspecs/modules/qt_lib_designer_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_help.pri
-usr/share/qt5/mkspecs/modules/qt_lib_help_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_uitools.pri
-usr/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri
diff --git a/debian/qttools5-private-dev.install b/debian/qttools5-private-dev.install
index 2993f47..c864142 100644
--- a/debian/qttools5-private-dev.install
+++ b/debian/qttools5-private-dev.install
@@ -117,3 +117,8 @@ usr/include/qt5/QtHelp/*/QtHelp/private/qhelpsearchindexreader_p.h
 usr/include/qt5/QtHelp/*/QtHelp/private/qhelpsearchindexwriter_clucene_p.h
 usr/include/qt5/QtHelp/*/QtHelp/private/qhelpsearchindexwriter_default_p.h
 usr/include/qt5/QtUiTools/*/QtUiTools/private/quiloader_p.h
+usr/share/qt5/mkspecs/modules/qt_lib_clucene_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_designer_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_designercomponents_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_help_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_uitools_private.pri

-- 
qttools packaging