[SCM] qtbase packaging branch, master, updated. debian/5.3.2+dfsg-3-2-g7eb6125

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 7eb6125cdab86e27cb1ff8cad189b7effd528fc7
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Oct 2 17:49:15 2014 -0300

    Move private stuff out of qtbase5-dev.
---
 debian/changelog                   | 4 ++++
 debian/control                     | 4 ++--
 debian/qtbase5-dev.install-common  | 7 -------
 debian/qtbase5-private-dev.install | 7 +++++++
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 36d19da..62d17db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.3.2+dfsg-4) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Move QPlatformSupport stuff from qtbase5-dev to qtbase5-private-dev, as it
+    belongs there. Update Breaks+Replaces.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 02 Oct 2014 17:39:20 -0300
 
 qtbase-opensource-src (5.3.2+dfsg-3) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 3ffc07e..6248ab2 100644
--- a/debian/control
+++ b/debian/control
@@ -306,8 +306,8 @@ Architecture: any
 Multi-Arch: same
 Section: libdevel
 Depends: qtbase5-dev (= ${binary:Version}), ${misc:Depends}
-Breaks: qtbase5-dev (<< 5.0.2+dfsg1-3~)
-Replaces: qtbase5-dev (<< 5.0.2+dfsg1-3~)
+Breaks: qtbase5-dev (<< 5.3.2+dfsg-4~)
+Replaces: qtbase5-dev (<< 5.3.2+dfsg-4~)
 Description: Qt 5 base 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/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index 8e38045..96a3657 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1000,10 +1000,6 @@ usr/include/*/qt5/QtOpenGLExtensions/QtOpenGLExtensionsDepends
 usr/include/*/qt5/QtOpenGLExtensions/QtOpenGLExtensionsVersion
 usr/include/*/qt5/QtOpenGLExtensions/qopenglextensions.h
 usr/include/*/qt5/QtOpenGLExtensions/qtopenglextensionsversion.h
-usr/include/*/qt5/QtPlatformSupport/QtPlatformSupport
-usr/include/*/qt5/QtPlatformSupport/QtPlatformSupportDepends
-usr/include/*/qt5/QtPlatformSupport/QtPlatformSupportVersion
-usr/include/*/qt5/QtPlatformSupport/qtplatformsupportversion.h
 usr/include/*/qt5/QtPrintSupport/QAbstractPrintDialog
 usr/include/*/qt5/QtPrintSupport/QPageSetupDialog
 usr/include/*/qt5/QtPrintSupport/QPrintDialog
@@ -1534,8 +1530,6 @@ usr/lib/*/libQt5Network.prl
 usr/lib/*/libQt5Network.so
 usr/lib/*/libQt5OpenGLExtensions.a
 usr/lib/*/libQt5OpenGLExtensions.prl
-usr/lib/*/libQt5PlatformSupport.a
-usr/lib/*/libQt5PlatformSupport.prl
 usr/lib/*/libQt5PrintSupport.prl
 usr/lib/*/libQt5PrintSupport.so
 usr/lib/*/libQt5Sql.prl
@@ -1553,7 +1547,6 @@ usr/lib/*/pkgconfig/Qt5DBus.pc
 usr/lib/*/pkgconfig/Qt5Gui.pc
 usr/lib/*/pkgconfig/Qt5Network.pc
 usr/lib/*/pkgconfig/Qt5OpenGLExtensions.pc
-usr/lib/*/pkgconfig/Qt5PlatformSupport.pc
 usr/lib/*/pkgconfig/Qt5PrintSupport.pc
 usr/lib/*/pkgconfig/Qt5Sql.pc
 usr/lib/*/pkgconfig/Qt5Test.pc
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index 5c2ea61..9f21bc1 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -449,6 +449,10 @@ usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qmacmime_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qunixeventdispatcher_qpa_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/qxlibeglintegration_p.h
 usr/include/*/qt5/QtPlatformSupport/*/QtPlatformSupport/private/struct_marshallers_p.h
+usr/include/*/qt5/QtPlatformSupport/QtPlatformSupport
+usr/include/*/qt5/QtPlatformSupport/QtPlatformSupportDepends
+usr/include/*/qt5/QtPlatformSupport/QtPlatformSupportVersion
+usr/include/*/qt5/QtPlatformSupport/qtplatformsupportversion.h
 usr/include/*/qt5/QtPrintSupport/*/QtPrintSupport/private/qabstractprintdialog_p.h
 usr/include/*/qt5/QtPrintSupport/*/QtPrintSupport/private/qcups_p.h
 usr/include/*/qt5/QtPrintSupport/*/QtPrintSupport/private/qcupsjobwidget_p.h
@@ -636,3 +640,6 @@ usr/include/*/qt5/QtWidgets/*/QtWidgets/private/qwindowsxpstyle_p.h
 usr/include/*/qt5/QtWidgets/*/QtWidgets/private/qwindowsxpstyle_p_p.h
 usr/include/*/qt5/QtWidgets/*/QtWidgets/private/qwizard_win_p.h
 usr/include/*/qt5/QtXml/*/QtXml/private/qxml_p.h
+usr/lib/*/libQt5PlatformSupport.a
+usr/lib/*/libQt5PlatformSupport.prl
+usr/lib/*/pkgconfig/Qt5PlatformSupport.pc

-- 
qtbase packaging