debian packaging fix

qgis · Feb 19, 2013 · 69a919d · 69a919d
1 parent 24ba638
commit 69a919d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/debian/qgis-oracle-provider.install.in b/debian/qgis-oracle-provider.install.in
@@ -1,2 +1,2 @@
 usr/lib/qgis/plugins/liboracleprovider.so
-usr/lib/{DEB_BUILD_GNU_TYPE}/qt4/plugins/sqldrivers/libqsqlocispatial.so
+{QT_PLUGIN_DIR}/sqldrivers/libqsqlocispatial.so
diff --git a/debian/qgis-providers-common.install b/debian/qgis-providers-common.install
@@ -3,4 +3,3 @@ usr/share/qgis/resources/qgis.db
 usr/share/qgis/resources/srs.db
 usr/share/qgis/resources/symbology-ng-style.db
 usr/share/qgis/resources/cpt-city-qgis-min/*
-usr/lib/{DEB_BUILD_GNU_TYPE}/qt4/plugins/sqldrivers/libqsqlspatialite.so
diff --git a/debian/rules b/debian/rules
@@ -125,7 +125,7 @@ define gentemplate
 $(2): $(1)
 	sed \
 		-e "s/{DEB_BUILD_GNU_TYPE}/$(DEB_BUILD_GNU_TYPE)/g" \
-		-e "s/{QT_PLUGIN_DIR}/$(QT_PLUGIN_DIR)/g" \
+		-e "s#{QT_PLUGIN_DIR}#$(QT_PLUGIN_DIR)#g" \
 		-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
 		-e "s/{GRASS}/$(GRASS)/g" \
 		-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@