Don't rely on GRASSVER placeholder in template files.

Use ? to match both '6' & '7'.
qgis · Feb 24, 2019 · 38fad4d · 38fad4d
1 parent 9c772d1
commit 38fad4d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 12 deletions.
diff --git a/debian/libqgis-dev.install.in b/debian/libqgis-dev.install.in
@@ -6,6 +6,6 @@ usr/lib/libqgis_core.so
 usr/lib/libqgis_gui.so
 usr/lib/libqgis_native.so
 usr/lib/libqgis_server.so
-usr/lib/libqgisgrass{GRASSVER}.so
+usr/lib/libqgisgrass?.so
 usr/lib/libqgispython.so
 usr/share/qgis/FindQGIS.cmake
diff --git a/debian/libqgisgrass{GRASSVER_QGIS_ABI}.install b/debian/libqgisgrass{GRASSVER_QGIS_ABI}.install
@@ -1 +1 @@
-usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
+usr/lib/libqgisgrass?.so.*
diff --git a/debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides b/debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides
@@ -1,2 +1,2 @@
-libqgisgrass{GRASSVER}-{QGIS_ABI}: hardening-no-fortify-functions usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
-libqgisgrass{GRASSVER}-{QGIS_ABI}: no-symbols-control-file usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
+hardening-no-fortify-functions *
+no-symbols-control-file *
diff --git a/debian/qgis-plugin-grass.install b/debian/qgis-plugin-grass.install
@@ -0,0 +1,2 @@
+usr/lib/qgis/grass/bin/qgis.g.browser?
+usr/lib/qgis/plugins/libgrassplugin?.so
diff --git a/debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install.in
diff --git a/debian/qgis-provider-grass.install b/debian/qgis-provider-grass.install
@@ -0,0 +1,6 @@
+usr/lib/qgis/grass/modules/qgis.d.rast?
+usr/lib/qgis/grass/modules/qgis.g.info?
+usr/lib/qgis/grass/modules/qgis.r.in?
+usr/lib/qgis/grass/modules/qgis.v.in?
+usr/lib/qgis/plugins/libgrassprovider?.so
+usr/lib/qgis/plugins/libgrassrasterprovider?.so
diff --git a/debian/qgis-provider-grass.install.in b/debian/qgis-provider-grass.install.in
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
		usr/lib/libqgisgrass?.so.*
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		usr/lib/qgis/grass/bin/qgis.g.browser?
		usr/lib/qgis/plugins/libgrassplugin?.so