[SCM] qtxmlpatterns packaging branch, master, updated. debian/5.2.0-2

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit d5a2266b6f6de4002c7057a87aaa1485cdfc0f1e
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 21 11:23:04 2013 +0100

    install private qmake stuff in libqt5xmlpatterns5-private-dev
    
    .. and in libqt5xmlpatterns5-dev
---
 debian/changelog                              | 4 ++++
 debian/control                                | 2 ++
 debian/libqt5xmlpatterns5-dev.install         | 1 -
 debian/libqt5xmlpatterns5-private-dev.install | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1306c1d..9f13767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ qtxmlpatterns-opensource-src (5.2.0-2) UNRELEASED; urgency=low
   * Enable make check.
   * Conditionally skip the network dependent unit tests.
 
+  [ Pino Toscano ]
+  * Install the private qmake stuff in libqt5xmlpatterns5-private-dev and not
+    in libqt5xmlpatterns5-dev.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 12 Dec 2013 23:40:02 -0300
 
 qtxmlpatterns-opensource-src (5.2.0-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index 317768f..332f53d 100644
--- a/debian/control
+++ b/debian/control
@@ -50,6 +50,8 @@ Architecture: any
 Section: libdevel
 Depends: libqt5xmlpatterns5-dev (= ${binary:Version}),
          ${misc:Depends},
+Breaks: libqt5xmlpatterns5-dev (<< 5.2.0-2~)
+Replaces: libqt5xmlpatterns5-dev (<< 5.2.0-2~)
 Description: Qt 5 XML patterns 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/libqt5xmlpatterns5-dev.install b/debian/libqt5xmlpatterns5-dev.install
index 0f8cee6..fee3f94 100644
--- a/debian/libqt5xmlpatterns5-dev.install
+++ b/debian/libqt5xmlpatterns5-dev.install
@@ -39,4 +39,3 @@ usr/lib/*/libQt5XmlPatterns.prl
 usr/lib/*/libQt5XmlPatterns.so
 usr/lib/*/pkgconfig/Qt5XmlPatterns.pc
 usr/share/qt5/mkspecs/modules/qt_lib_xmlpatterns.pri
-usr/share/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri
diff --git a/debian/libqt5xmlpatterns5-private-dev.install b/debian/libqt5xmlpatterns5-private-dev.install
index 6a1a4ac..02347a0 100644
--- a/debian/libqt5xmlpatterns5-private-dev.install
+++ b/debian/libqt5xmlpatterns5-private-dev.install
@@ -365,3 +365,4 @@ usr/include/qt5/QtXmlPatterns/*/QtXmlPatterns/private/qxsltsimplecontentconstruc
 usr/include/qt5/QtXmlPatterns/*/QtXmlPatterns/private/qxslttokenizer_p.h
 usr/include/qt5/QtXmlPatterns/*/QtXmlPatterns/private/qxslttokenlookup_p.h
 usr/include/qt5/QtXmlPatterns/*/QtXmlPatterns/private/qyearmonthduration_p.h
+usr/share/qt5/mkspecs/modules/qt_lib_xmlpatterns_private.pri

-- 
qtxmlpatterns packaging