[SCM] qtbase packaging branch, experimental, updated. debian/5.2.0+dfsg-7-7-g79bfcf4

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the experimental branch:
commit 79bfcf496067ebde955a017f0d5075a6c0498139
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Feb 8 00:26:27 2014 -0300

    Do not install any CMake file for any plugin.
---
 debian/changelog                  | 1 +
 debian/qtbase5-dev.install-armel  | 3 ---
 debian/qtbase5-dev.install-armhf  | 3 ---
 debian/qtbase5-dev.install-common | 7 -------
 debian/qtbase5-dev.install-linux  | 3 ---
 debian/rules                      | 4 ++--
 6 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0af778c..e1da43d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.2.1+dfsg-1) UNRELEASED; urgency=medium
   * Remove sha3_64bit_BE.diff, uname_include.diff and
     fix_crash_stale_pointer_dereferencing.patch, applied upstream.
   * Update symbols files with buildd's logs.
+  * Do not install any CMake file for any plugin.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 07 Feb 2014 13:06:24 -0300
 
diff --git a/debian/qtbase5-dev.install-armel b/debian/qtbase5-dev.install-armel
deleted file mode 100644
index d3d7998..0000000
--- a/debian/qtbase5-dev.install-armel
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QKmsIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
diff --git a/debian/qtbase5-dev.install-armhf b/debian/qtbase5-dev.install-armhf
deleted file mode 100644
index d3d7998..0000000
--- a/debian/qtbase5-dev.install-armhf
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QKmsIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index e4b1e39..280856c 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1503,15 +1503,8 @@ usr/lib/*/cmake/Qt5DBus/Qt5DBusMacros.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfig.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake
 usr/lib/*/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake
 usr/lib/*/cmake/Qt5Network/Qt5NetworkConfig.cmake
 usr/lib/*/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake
-usr/lib/*/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake
 usr/lib/*/cmake/Qt5OpenGL/Qt5OpenGLConfig.cmake
 usr/lib/*/cmake/Qt5OpenGL/Qt5OpenGLConfigVersion.cmake
 usr/lib/*/cmake/Qt5OpenGLExtensions/Qt5OpenGLExtensionsConfig.cmake
diff --git a/debian/qtbase5-dev.install-linux b/debian/qtbase5-dev.install-linux
deleted file mode 100644
index 451f9ab..0000000
--- a/debian/qtbase5-dev.install-linux
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
-usr/lib/*/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
-usr/lib/*/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake
diff --git a/debian/rules b/debian/rules
index fd799b1..865742d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -234,9 +234,9 @@ override_dh_auto_install-arch:
 	# 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
+	# A user of Qt built by a distro doesn't need to find where the plugins
 	# are via CMake, so don't install them.
-	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt5Sql/Qt5Sql_Q*DriverPlugin.cmake
+	rm -fv debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/cmake/Qt5*/Q*Plugin.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/ \

-- 
qtbase packaging