[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 153307d1475011390422b80737e77c5fe2dc5f9a
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 14 12:52:20 2013 +0100

    remove cmake files of QtSql plugins on dh_auto_install instead of dh_install
---
 debian/changelog | 2 ++
 debian/rules     | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index adc70c7..bc2766a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qtbase-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=medium
   * Include sys/utsname.h for uname(3); patch uname_include.diff.
   * Move few Linux-only files from qtbase5-dev.install-common to
     qtbase5-dev.install-linux.
+  * Remove the cmake files of QtSql plugins on dh_auto_install phase instead
+    of dh_install.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Dec 2013 10:06:56 +0100
 
diff --git a/debian/rules b/debian/rules
index bf4606d..1aeabe2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -237,6 +237,10 @@ override_dh_auto_install:
 	# Remove libtool-like files
 	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
 
+	# A user of Qt built by a distro doesn't need 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
+
 	# Remove bogus exec bits from some data files in mkspecs, docs, examples
 	find debian/tmp/usr/share/qt5/ debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/ \
 		-perm /u+x,g+x,o+x -type f \
@@ -257,10 +261,6 @@ 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