[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0-beta1+dfsg-3-16-gd119d0d

Sun Dec 8 16:40:33 UTC 2013

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

The following commit has been merged in the experimental branch:
commit d119d0dc92e9b2f6c50e1c1a4c76ebac48835433
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Dec 8 13:36:14 2013 -0300

    Revert "Split sql-related dev files to the new libqt5sql5-dev package"
    
    This reverts commit 47b150973ceacebdbe9d08cd57bd1cb419851260.
    
    Actually CMake files for plugins are of no use for us.
---
 debian/changelog                  |  5 -----
 debian/control                    | 20 +----------------
 debian/libqt5sql5-dev.install     | 45 ---------------------------------------
 debian/qtbase5-dev.install-common | 45 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 46 insertions(+), 69 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ce82162..3252ed7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,6 @@ qtbase-opensource-src (5.2.0~rc1+dfsg-1) UNRELEASED; urgency=low
   * Update symbols files, marking private symbols as such.
   * Remove Disallow_deep_or_widely_nested_entity_references.patch, it has been
     applied upstream.
-  * Split sql-related dev files to the new libqt5sql5-dev package
-    (Closes: #729602).
-    - Create the new package, splitting the files from qtbase5-dev.
-    - Make qtbase5-dev recommend libqt5sql5-dev.
-    - Make libqt5sql5-dev depend on the SQL backend's plugins.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Nov 2013 19:31:35 +0400
 
diff --git a/debian/control b/debian/control
index 8e9141b..e584d01 100644
--- a/debian/control
+++ b/debian/control
@@ -126,23 +126,6 @@ Description: Qt 5 SQL module
  The QtSql module helps you provide seamless database integration to your Qt
  applications.
 
-Package: libqt5sql5-dev
-Architecture: any
-Section: libdevel
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: libqt5sql5-mysql,
-         libqt5sql5-odbc,
-         libqt5sql5-psql,
-         libqt5sql5-sqlite,
-         libqt5sql5-tds,
-         ${misc:Depends}
-Description: Qt 5 SQL library 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.
- .
- This package contains the development files needed to build Qt 5 applications
- using SQL backends.
-
 Package: libqt5sql5-mysql
 Architecture: any
 Multi-Arch: same
@@ -295,8 +278,7 @@ Depends: libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
          qtbase5-dev-tools (= ${binary:Version}),
          qtchooser,
          ${misc:Depends}
-Recommends: libqt5opengl5-dev (= ${binary:Version}),
-            libqt5sql5-dev (= ${binary:Version})
+Recommends: libqt5opengl5-dev (= ${binary:Version})
 Suggests: firebird-dev,
           libmysqlclient-dev,
           libpq-dev,
diff --git a/debian/libqt5sql5-dev.install b/debian/libqt5sql5-dev.install
deleted file mode 100644
index a878b24..0000000
--- a/debian/libqt5sql5-dev.install
+++ /dev/null
@@ -1,45 +0,0 @@
-usr/include/qt5/QtSql/QSql
-usr/include/qt5/QtSql/QSqlDatabase
-usr/include/qt5/QtSql/QSqlDriver
-usr/include/qt5/QtSql/QSqlDriverCreator
-usr/include/qt5/QtSql/QSqlDriverCreatorBase
-usr/include/qt5/QtSql/QSqlDriverPlugin
-usr/include/qt5/QtSql/QSqlError
-usr/include/qt5/QtSql/QSqlField
-usr/include/qt5/QtSql/QSqlIndex
-usr/include/qt5/QtSql/QSqlQuery
-usr/include/qt5/QtSql/QSqlQueryModel
-usr/include/qt5/QtSql/QSqlRecord
-usr/include/qt5/QtSql/QSqlRelation
-usr/include/qt5/QtSql/QSqlRelationalDelegate
-usr/include/qt5/QtSql/QSqlRelationalTableModel
-usr/include/qt5/QtSql/QSqlResult
-usr/include/qt5/QtSql/QSqlTableModel
-usr/include/qt5/QtSql/QtSql
-usr/include/qt5/QtSql/QtSqlDepends
-usr/include/qt5/QtSql/QtSqlVersion
-usr/include/qt5/QtSql/qsql.h
-usr/include/qt5/QtSql/qsqldatabase.h
-usr/include/qt5/QtSql/qsqldriver.h
-usr/include/qt5/QtSql/qsqldriverplugin.h
-usr/include/qt5/QtSql/qsqlerror.h
-usr/include/qt5/QtSql/qsqlfield.h
-usr/include/qt5/QtSql/qsqlindex.h
-usr/include/qt5/QtSql/qsqlquery.h
-usr/include/qt5/QtSql/qsqlquerymodel.h
-usr/include/qt5/QtSql/qsqlrecord.h
-usr/include/qt5/QtSql/qsqlrelationaldelegate.h
-usr/include/qt5/QtSql/qsqlrelationaltablemodel.h
-usr/include/qt5/QtSql/qsqlresult.h
-usr/include/qt5/QtSql/qsqltablemodel.h
-usr/include/qt5/QtSql/qtsqlversion.h
-usr/lib/*/cmake/Qt5Sql/Qt5SqlConfig.cmake
-usr/lib/*/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake
-usr/lib/*/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake
-usr/lib/*/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake
-usr/lib/*/cmake/Qt5Sql/Qt5Sql_QPSQLDriverPlugin.cmake
-usr/lib/*/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
-usr/lib/*/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake
-usr/lib/*/libQt5Sql.prl
-usr/lib/*/libQt5Sql.so
-usr/lib/*/pkgconfig/Qt5Sql.pc
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index a19f8b1..badea1d 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1027,6 +1027,41 @@ 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/QSql
+usr/include/qt5/QtSql/QSqlDatabase
+usr/include/qt5/QtSql/QSqlDriver
+usr/include/qt5/QtSql/QSqlDriverCreator
+usr/include/qt5/QtSql/QSqlDriverCreatorBase
+usr/include/qt5/QtSql/QSqlDriverPlugin
+usr/include/qt5/QtSql/QSqlError
+usr/include/qt5/QtSql/QSqlField
+usr/include/qt5/QtSql/QSqlIndex
+usr/include/qt5/QtSql/QSqlQuery
+usr/include/qt5/QtSql/QSqlQueryModel
+usr/include/qt5/QtSql/QSqlRecord
+usr/include/qt5/QtSql/QSqlRelation
+usr/include/qt5/QtSql/QSqlRelationalDelegate
+usr/include/qt5/QtSql/QSqlRelationalTableModel
+usr/include/qt5/QtSql/QSqlResult
+usr/include/qt5/QtSql/QSqlTableModel
+usr/include/qt5/QtSql/QtSql
+usr/include/qt5/QtSql/QtSqlDepends
+usr/include/qt5/QtSql/QtSqlVersion
+usr/include/qt5/QtSql/qsql.h
+usr/include/qt5/QtSql/qsqldatabase.h
+usr/include/qt5/QtSql/qsqldriver.h
+usr/include/qt5/QtSql/qsqldriverplugin.h
+usr/include/qt5/QtSql/qsqlerror.h
+usr/include/qt5/QtSql/qsqlfield.h
+usr/include/qt5/QtSql/qsqlindex.h
+usr/include/qt5/QtSql/qsqlquery.h
+usr/include/qt5/QtSql/qsqlquerymodel.h
+usr/include/qt5/QtSql/qsqlrecord.h
+usr/include/qt5/QtSql/qsqlrelationaldelegate.h
+usr/include/qt5/QtSql/qsqlrelationaltablemodel.h
+usr/include/qt5/QtSql/qsqlresult.h
+usr/include/qt5/QtSql/qsqltablemodel.h
+usr/include/qt5/QtSql/qtsqlversion.h
 usr/include/qt5/QtTest/QEventSizeOfChecker
 usr/include/qt5/QtTest/QSignalSpy
 usr/include/qt5/QtTest/QSpontaneKeyEvent
@@ -1486,6 +1521,13 @@ usr/lib/*/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
 usr/lib/*/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfigVersion.cmake
 usr/lib/*/cmake/Qt5PrintSupport/Qt5PrintSupportConfig.cmake
 usr/lib/*/cmake/Qt5PrintSupport/Qt5PrintSupportConfigVersion.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5SqlConfig.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5Sql_QMYSQLDriverPlugin.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5Sql_QODBCDriverPlugin.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5Sql_QPSQLDriverPlugin.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5Sql_QSQLiteDriverPlugin.cmake
+usr/lib/*/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake
 usr/lib/*/cmake/Qt5Test/Qt5TestConfig.cmake
 usr/lib/*/cmake/Qt5Test/Qt5TestConfigVersion.cmake
 usr/lib/*/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake
@@ -1513,6 +1555,8 @@ usr/lib/*/libQt5PlatformSupport.a
 usr/lib/*/libQt5PlatformSupport.prl
 usr/lib/*/libQt5PrintSupport.prl
 usr/lib/*/libQt5PrintSupport.so
+usr/lib/*/libQt5Sql.prl
+usr/lib/*/libQt5Sql.so
 usr/lib/*/libQt5Test.prl
 usr/lib/*/libQt5Test.so
 usr/lib/*/libQt5Widgets.prl
@@ -1528,6 +1572,7 @@ 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
 usr/lib/*/pkgconfig/Qt5Widgets.pc
 usr/lib/*/pkgconfig/Qt5Xml.pc

-- 
qtbase packaging

