[SCM] qtbase packaging branch, master, updated. debian/5.0.2+dfsg1-2-5-gd53cf17

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit d53cf17ac26c8467e2ac85d9d31468781419b00e
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 21 10:20:54 2013 +0200

    move the private qsqlresult_p.h from qtbase5-dev to qtbase5-private-dev
    
    add proper breaks/replaces in the latter
---
 debian/changelog                   |    2 ++
 debian/control                     |    2 ++
 debian/qtbase5-dev.install         |    1 -
 debian/qtbase5-private-dev.install |    1 +
 4 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d6ba1f1..f6bebac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ qtbase-opensource-src (5.0.2+dfsg1-3) UNRELEASED; urgency=low
     libqt5sql5-tds.
   * debian/control: make libqt5printsupport5 recommend libcups2 (which is
     dlopen'ed).
+  * Move the private qsqlresult_p.h from qtbase5-dev to qtbase5-private-dev,
+    adding proper breaks/replaces in the latter.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 21 Apr 2013 10:01:11 +0200
 
diff --git a/debian/control b/debian/control
index fba27cf..e911161 100644
--- a/debian/control
+++ b/debian/control
@@ -287,6 +287,8 @@ Architecture: any
 Section: libdevel
 Pre-Depends: dpkg (>= 1.15.6~)
 Depends: qtbase5-dev (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Breaks: qtbase-dev (<< 5.0.2+dfsg1-3~)
+Replaces: qtbase-dev (<< 5.0.2+dfsg1-3~)
 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 b/debian/qtbase5-dev.install
index f9336f4..f7e52ab 100644
--- a/debian/qtbase5-dev.install
+++ b/debian/qtbase5-dev.install
@@ -920,7 +920,6 @@ usr/include/qt5/QtPrintSupport/qprintpreviewdialog.h
 usr/include/qt5/QtPrintSupport/qprintpreviewwidget.h
 usr/include/qt5/QtPrintSupport/qtprintsupportglobal.h
 usr/include/qt5/QtPrintSupport/qtprintsupportversion.h
-usr/include/qt5/QtSql/5.0.2/QtSql/private/qsqlresult_p.h
 usr/include/qt5/QtSql/QSql
 usr/include/qt5/QtSql/QSqlDatabase
 usr/include/qt5/QtSql/QSqlDriver
diff --git a/debian/qtbase5-private-dev.install b/debian/qtbase5-private-dev.install
index 6f68056..1a098a8 100644
--- a/debian/qtbase5-private-dev.install
+++ b/debian/qtbase5-private-dev.install
@@ -438,6 +438,7 @@ usr/include/qt5/QtPrintSupport/*/QtPrintSupport/qpa/qplatformprintplugin.h
 usr/include/qt5/QtSql/*/QtSql/private/qsqlcachedresult_p.h
 usr/include/qt5/QtSql/*/QtSql/private/qsqlnulldriver_p.h
 usr/include/qt5/QtSql/*/QtSql/private/qsqlquerymodel_p.h
+usr/include/qt5/QtSql/*/QtSql/private/qsqlresult_p.h
 usr/include/qt5/QtSql/*/QtSql/private/qsqltablemodel_p.h
 usr/include/qt5/QtTest/*/QtTest/private/callgrind_p.h
 usr/include/qt5/QtTest/*/QtTest/private/cycle_p.h

-- 
qtbase packaging