[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=35a73c1

The following commit has been merged in the master branch:
commit 35a73c132b25110eeedef4daf6986fd6fa48d3f9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Dec 4 18:18:24 2013 +0400

    Do not list armhf-specific paths in qtbase5-dev.install-armel.
    
    Should fix build failure on armel.
---
 debian/changelog                 | 1 +
 debian/qtbase5-dev.install-armel | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b7f1421..84398e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.2.0~rc1+dfsg-1) UNRELEASED; urgency=low
 
   [ Dmitry Shachnev ]
   * Fix two wrongly sorted lines in qtbase5-private-dev.install (thanks Timo).
+  * Do not list armhf-specific paths in qtbase5-dev.install-armel.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * New upstream release.
diff --git a/debian/qtbase5-dev.install-armel b/debian/qtbase5-dev.install-armel
index 53c8cbf..a03f1e3 100644
--- a/debian/qtbase5-dev.install-armel
+++ b/debian/qtbase5-dev.install-armel
@@ -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_QKmsIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake

-- 
qtbase packaging