[SCM] qtdeclarative packaging branch, experimental, updated. debian/5.2.0-4-6-gaec35fa

[Pino Toscano]

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

The following commit has been merged in the experimental branch:
commit aec35fa3ab535fc5554216dc937d11c68bfa0f1a
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 21 11:36:46 2013 +0100

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

diff --git a/debian/changelog b/debian/changelog
index 392cbd6..933f8ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ qtdeclarative-opensource-src (5.2.0-5) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Add proper breaks/replaces for qml move.
+  * Install the private qmake stuff in qtdeclarative5-private-dev and not
+    in qtdeclarative5-dev.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Dec 2013 21:49:05 +0400
 
diff --git a/debian/control b/debian/control
index 3e98b4d..dc5dc69 100644
--- a/debian/control
+++ b/debian/control
@@ -216,6 +216,8 @@ Architecture: any
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qtdeclarative5-dev (= ${binary:Version}), ${misc:Depends}
+Breaks: qtdeclarative5-dev (<< 5.2.0-5~)
+Replaces: qtdeclarative5-dev (<< 5.2.0-5~)
 Description: Qt 5 declarative 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/qtdeclarative5-dev.install b/debian/qtdeclarative5-dev.install
index ff9cefb..0071b79 100644
--- a/debian/qtdeclarative5-dev.install
+++ b/debian/qtdeclarative5-dev.install
@@ -153,10 +153,5 @@ usr/lib/*/pkgconfig/Qt5Quick.pc
 usr/lib/*/pkgconfig/Qt5QuickParticles.pc
 usr/lib/*/pkgconfig/Qt5QuickTest.pc
 usr/share/qt5/mkspecs/modules/qt_lib_qml.pri
-usr/share/qt5/mkspecs/modules/qt_lib_qml_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_qmltest.pri
-usr/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri
 usr/share/qt5/mkspecs/modules/qt_lib_quick.pri
-usr/share/qt5/mkspecs/modules/qt_lib_quick_private.pri
-usr/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
diff --git a/debian/qtdeclarative5-private-dev.install b/debian/qtdeclarative5-private-dev.install
index db07a6a..435c6af 100644
--- a/debian/qtdeclarative5-private-dev.install
+++ b/debian/qtdeclarative5-private-dev.install
@@ -360,3 +360,8 @@ usr/include/qt5/QtQuickParticles/*/QtQuickParticles/private/qtquickparticlesglob
 usr/include/qt5/QtQuickTest/*/QtQuickTest/private/qtestoptions_p.h
 usr/include/qt5/QtQuickTest/*/QtQuickTest/private/quicktestevent_p.h
 usr/include/qt5/QtQuickTest/*/QtQuickTest/private/quicktestresult_p.h
+usr/share/qt5/mkspecs/modules/qt_lib_qml_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_qmltest_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_quick_private.pri
+usr/share/qt5/mkspecs/modules/qt_lib_quickparticles_private.pri

-- 
qtdeclarative packaging