[SCM] qtbase packaging branch, master, updated. debian/5.1.1+dfsg-2-3-ga2fb85a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit a2fb85a69ff16bbeed4cdf57abddbc22927db6be
Author: Pino Toscano <pino at debian.org>
Date:   Wed Sep 11 08:36:45 2013 +0200

    move few files from libqt5gui5.install-linux to libqt5gui5.install-common
    
    libcomposeplatforminputcontextplugin.so, libqoffscreen.so and
    libqgtk2.so are compiled also on non-Linux OSes
---
 debian/changelog                 |    4 ++++
 debian/libqt5gui5.install-common |    3 +++
 debian/libqt5gui5.install-linux  |    3 ---
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 63b1359..3a5dc04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.1.1+dfsg-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Move libcomposeplatforminputcontextplugin.so, libqoffscreen.so and
+    libqgtk2.so from libqt5gui5.install-linux to libqt5gui5.install-common,
+    as they are compiled also on non-Linux OSes.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 11 Sep 2013 08:20:45 +0200
 
diff --git a/debian/libqt5gui5.install-common b/debian/libqt5gui5.install-common
index 10fe2b2..5d555a9 100644
--- a/debian/libqt5gui5.install-common
+++ b/debian/libqt5gui5.install-common
@@ -2,7 +2,10 @@ usr/lib/*/libQt5Gui.so.*
 usr/lib/*/qt5/plugins/imageformats/libqgif.so
 usr/lib/*/qt5/plugins/imageformats/libqico.so
 usr/lib/*/qt5/plugins/imageformats/libqjpeg.so
+usr/lib/*/qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
 usr/lib/*/qt5/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so
 usr/lib/*/qt5/plugins/platforminputcontexts/libmaliitplatforminputcontextplugin.so
 usr/lib/*/qt5/plugins/platforms/libqminimal.so
+usr/lib/*/qt5/plugins/platforms/libqoffscreen.so
 usr/lib/*/qt5/plugins/platforms/libqxcb.so
+usr/lib/*/qt5/plugins/platformthemes/libqgtk2.so
diff --git a/debian/libqt5gui5.install-linux b/debian/libqt5gui5.install-linux
index 94686bf..80ed7f6 100644
--- a/debian/libqt5gui5.install-linux
+++ b/debian/libqt5gui5.install-linux
@@ -2,7 +2,4 @@ usr/lib/*/qt5/plugins/generic/libqevdevkeyboardplugin.so
 usr/lib/*/qt5/plugins/generic/libqevdevmouseplugin.so
 usr/lib/*/qt5/plugins/generic/libqevdevtabletplugin.so
 usr/lib/*/qt5/plugins/generic/libqevdevtouchplugin.so
-usr/lib/*/qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
 usr/lib/*/qt5/plugins/platforms/libqlinuxfb.so
-usr/lib/*/qt5/plugins/platforms/libqoffscreen.so
-usr/lib/*/qt5/plugins/platformthemes/libqgtk2.so

-- 
qtbase packaging