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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 53eb2a9dc731232ffbb80965fad745fb6abdb35a
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Dec 12 17:32:57 2013 -0300

    Do not install CMake files that find the SQL plugins.
    
    They should not be needed by a normal distro user.
---
 debian/changelog                  | 2 ++
 debian/qtbase5-dev.install-common | 5 -----
 debian/rules                      | 4 ++++
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 297ad1c..14627bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ qtbase-opensource-src (5.2.0+dfsg-1) UNRELEASED; urgency=low
       - Make libqt5core5a break and replace libqt5core5 << 5.2.0+dfsg~.
       - Rename the associated files (install, lintian-overrides and symbols).
     - Re create symbols that used the qreal subst, they are now all doubles.
+  * A user of Qt built by a distro doesn't needs to find where the SQL plugins
+    are via CMake. Do not install them (Closes: #729602).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 26 Nov 2013 19:31:35 +0400
 
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index badea1d..e61e860 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1523,11 +1523,6 @@ 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
diff --git a/debian/rules b/debian/rules
index 6f72c34..bf4606d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -257,6 +257,10 @@ override_dh_install:
 		cat debian/$$pkg.install-$(os) >> debian/$$pkg.install ; \
 	done
 
+	# A user of Qt built by a distro doesn't needs to find where the SQL plugins
+	# are via CMake, so don't install them.
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt5Sql/Qt5Sql_Q*DriverPlugin.cmake
+
 	# Call dh_install normally. It will process .install, .install.ARCH
 	# and/or .install.OS files.
 	dh_install --fail-missing

-- 
qtbase packaging