[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=1853124

The following commit has been merged in the master branch:
commit 18531245ab50f2e56824756f68ece96d38906c07
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 14 12:48:54 2013 +0100

    move few Linux-only files from qtbase5-dev.install-common to qtbase5-dev.install-linux
---
 debian/changelog                  | 2 ++
 debian/qtbase5-dev.install-common | 3 ---
 debian/qtbase5-dev.install-linux  | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da5e71a..adc70c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ qtbase-opensource-src (5.2.0+dfsg-2) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Simplify and sort qtbase5-dev.install-armel and qtbase5-dev.install-armhf.
   * 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.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Dec 2013 10:06:56 +0100
 
diff --git a/debian/qtbase5-dev.install-common b/debian/qtbase5-dev.install-common
index e61e860..e4b1e39 100644
--- a/debian/qtbase5-dev.install-common
+++ b/debian/qtbase5-dev.install-common
@@ -1506,15 +1506,12 @@ 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_QLinuxFbIntegrationPlugin.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_QConnmanEnginePlugin.cmake
 usr/lib/*/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake
-usr/lib/*/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.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
new file mode 100644
index 0000000..451f9ab
--- /dev/null
+++ b/debian/qtbase5-dev.install-linux
@@ -0,0 +1,3 @@
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QLinuxFbIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Network/Qt5Network_QConnmanEnginePlugin.cmake
+usr/lib/*/cmake/Qt5Network/Qt5Network_QNetworkManagerEnginePlugin.cmake

-- 
qtbase packaging