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

The following commit has been merged in the master branch:
commit b571ab0c4580c5f5951b1ad1fe4c7ba92df38b98
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 14 10:10:09 2013 +0100

    qtbase5-dev.install-{armel,armhf}: simplify and sort
---
 debian/changelog                 | 2 ++
 debian/qtbase5-dev.install-armel | 2 +-
 debian/qtbase5-dev.install-armhf | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64615dc..21c96b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 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.
 
  -- 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-armel b/debian/qtbase5-dev.install-armel
index a03f1e3..d3d7998 100644
--- a/debian/qtbase5-dev.install-armel
+++ b/debian/qtbase5-dev.install-armel
@@ -1,3 +1,3 @@
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QKmsIntegrationPlugin.cmake
 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
index 53c8cbf..d3d7998 100644
--- a/debian/qtbase5-dev.install-armhf
+++ b/debian/qtbase5-dev.install-armhf
@@ -1,3 +1,3 @@
-usr/lib/arm-linux-gnueabihf/cmake/Qt5Gui/Qt5Gui_QKmsIntegrationPlugin.cmake
-usr/lib/arm-linux-gnueabihf/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
-usr/lib/arm-linux-gnueabihf/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QKmsIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake

-- 
qtbase packaging