[qgis] 04/05: Use wildcards to match both qt4 & qt5 paths.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch qt5
in repository qgis.

commit 07dfe38c1ee8e72d78c13d03adf3b23e72adcafd
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 27 15:49:27 2016 +0100

    Use wildcards to match both qt4 & qt5 paths.
---
 debian/libqgis-customwidgets.install | 2 +-
 debian/qgis-oracle-provider.install  | 2 +-
 debian/qgis-providers.install        | 2 +-
 debian/rules                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/libqgis-customwidgets.install b/debian/libqgis-customwidgets.install
index 6f3ff47..51efa3d 100644
--- a/debian/libqgis-customwidgets.install
+++ b/debian/libqgis-customwidgets.install
@@ -1 +1 @@
-usr/lib/*/qt4/plugins/designer/libqgis_customwidgets.so*
+usr/lib/*/qt*/plugins/designer/libqgis_customwidgets.so*
diff --git a/debian/qgis-oracle-provider.install b/debian/qgis-oracle-provider.install
index a6f277f..dc73a14 100644
--- a/debian/qgis-oracle-provider.install
+++ b/debian/qgis-oracle-provider.install
@@ -1,2 +1,2 @@
 usr/lib/qgis/plugins/liboracleprovider.so
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlocispatial.so
+usr/lib/*/qt*/plugins/sqldrivers/libqsqlocispatial.so
diff --git a/debian/qgis-providers.install b/debian/qgis-providers.install
index aba12c5..ce71e2c 100644
--- a/debian/qgis-providers.install
+++ b/debian/qgis-providers.install
@@ -16,4 +16,4 @@ usr/lib/qgis/plugins/libvirtuallayerprovider.so
 usr/lib/qgis/plugins/libwcsprovider.so
 usr/lib/qgis/plugins/libwfsprovider.so
 usr/lib/qgis/plugins/libwmsprovider.so
-usr/lib/*/qt4/plugins/sqldrivers/libqsqlspatialite.so
+usr/lib/*/qt*/plugins/sqldrivers/libqsqlspatialite.so
diff --git a/debian/rules b/debian/rules
index 3417458..35048e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
 DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt4/plugins
+QT_PLUGIN_DIR = usr/lib/$(DEB_BUILD_MULTIARCH)/qt*/plugins
 
 DEB_TEST_TARGET ?= Experimental
 QGIS_BUILDDIR ?= debian/build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git