debian packaging update

git-svn-id: http://svn.osgeo.org/qgis/trunk@11718 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 27, 2009 · 72712cc · 72712cc
1 parent 917a6c7
commit 72712cc
Show file tree

Hide file tree

Showing 13 changed files with 5,194 additions and 24 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -4,8 +4,10 @@ qgis (1.4.0) UNRELEASED; urgency=low
   * use templates for configuration for ABIs and distributions
   * policy updated to 3.8.3
   * remove README.Debian from libqgis{QGIS_ABI}-dev
+  * add symbol files for shared libraries
+  * shorten qgis.sh
 
- -- Jürgen E. Fischer <jef@norbit.de>  Fri, 18 Sep 2009 18:50:02 +0200
+ -- Jürgen E. Fischer <jef@norbit.de>  Sun, 27 Sep 2009 02:34:35 +0200
 
 qgis (1.3.0) UNRELEASED; urgency=low
 

diff --git a/debian/control.sid b/debian/control.sid
@@ -70,7 +70,7 @@ Description: Quantum GIS - development files
 
 Package: qgis-plugin-grass
 Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass{GRASS_ABI}
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640-5
 Description: GRASS plugin for Quantum GIS
  Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
  and display databases of geographic information.

diff --git a/debian/libqgis1.lintian-overrides b/debian/libqgis1.lintian-overrides
diff --git a/debian/libqgis{QGIS_ABI}.install b/debian/libqgis{QGIS_ABI}.install
@@ -1,3 +1,3 @@
-usr/lib/libqgis_core.so.*.*.*
-usr/lib/libqgis_gui.so.*.*.*
-usr/lib/libqgis_analysis.so.*.*.*
+usr/lib/libqgis_core.so.{QGIS_ABI}
+usr/lib/libqgis_gui.so.{QGIS_ABI}
+usr/lib/libqgis_analysis.so.{QGIS_ABI}
diff --git a/debian/libqgis{QGIS_ABI}.lintian-overrides b/debian/libqgis{QGIS_ABI}.lintian-overrides
@@ -0,0 +1,2 @@
+libqgis{QGIS_ABI}: shlib-calls-exit
+libqgis{QGIS_ABI}: package-name-doesnt-match-sonames
diff --git a/debian/libqgis{QGIS_ABI}.symbols b/debian/libqgis{QGIS_ABI}.symbols
diff --git a/debian/python-qgis.install → debian/python-qgis.install.in b/debian/python-qgis.install → debian/python-qgis.install.in
@@ -1,4 +1,4 @@
 usr/lib/python*/{dist,site}-packages/qgis/__init__.py
 usr/lib/python*/{dist,site}-packages/qgis/qgisconfig.py
 usr/lib/python*/{dist,site}-packages/qgis/*.so
-usr/lib/libqgispython.so*
+usr/lib/libqgispython.so.{QGIS_ABI}
diff --git a/debian/python-qgis.lintian-overrides → debian/python-qgis.lintian-overrides.in b/debian/python-qgis.lintian-overrides → debian/python-qgis.lintian-overrides.in
@@ -1,2 +1 @@
 python-qgis: package-name-doesnt-match-sonames
-python-qgis: non-dev-pkg-with-shlib-symlink
diff --git a/debian/python-qgis.symbols b/debian/python-qgis.symbols
@@ -0,0 +1,47 @@
+libqgispython.so.1.4.0 python-qgis #MINVER#
+ _ZN10QByteArrayD1Ev@Base 1.4.0
+ _ZN14QgsPythonUtilsD0Ev@Base 1.4.0
+ _ZN14QgsPythonUtilsD1Ev@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl10evalStringERK7QStringRS0_@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl10exitPythonEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl10initPythonEP13QgisInterface@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl10loadPluginE7QString@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl10pluginListEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl10pythonPathEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl11pluginsPathEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl11startPluginE7QString@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl12getTracebackEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl12unloadPluginE7QString@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl15getTypeAsStringEP7_object@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl15homePluginsPathEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl15runStringUnsafeERK7QStringb@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl16installErrorHookEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl17PyObjectToQStringEP7_object@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl17getPluginMetadataE7QStringS0_@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl18uninstallErrorHookEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl19getVariableFromMainE7QString@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl19installConsoleHooksEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl21uninstallConsoleHooksEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl8getErrorER7QStringS1_@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl9getResultEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl9isEnabledEv@Base 1.4.0
+ _ZN18QgsPythonUtilsImpl9runStringERK7QStringS0_@Base 1.4.0
+ _ZN18QgsPythonUtilsImplC1Ev@Base 1.4.0
+ _ZN18QgsPythonUtilsImplC2Ev@Base 1.4.0
+ _ZN18QgsPythonUtilsImplD0Ev@Base 1.4.0
+ _ZN18QgsPythonUtilsImplD1Ev@Base 1.4.0
+ _ZN18QgsPythonUtilsImplD2Ev@Base 1.4.0
+ _ZN5QListI7QStringE4freeEPN9QListData4DataE@Base 1.4.0
+ _ZN5QListI7QStringE6appendERKS0_@Base 1.4.0
+ _ZN7QStringC1EPKc@Base 1.4.0
+ _ZN7QStringC1ERKS_@Base 1.4.0
+ _ZN7QStringD1Ev@Base 1.4.0
+ _ZN7QStringaSEPKc@Base 1.4.0
+ _ZTI14QgsPythonUtils@Base 1.4.0
+ _ZTI18QgsPythonUtilsImpl@Base 1.4.0
+ _ZTS14QgsPythonUtils@Base 1.4.0
+ _ZTS18QgsPythonUtilsImpl@Base 1.4.0
+ _ZTV14QgsPythonUtils@Base 1.4.0
+ _ZTV18QgsPythonUtilsImpl@Base 1.4.0
+ _ZplRK7QStringPKc@Base 1.4.0
+ instance@Base 1.4.0
diff --git a/debian/qgis-plugin-grass.install → debian/qgis-plugin-grass.install.in b/debian/qgis-plugin-grass.install → debian/qgis-plugin-grass.install.in
@@ -1,3 +1,3 @@
 usr/lib/qgis/libgrassplugin.so
 usr/lib/qgis/libgrassprovider.so
-usr/lib/libqgisgrass.so.*.*.*
+usr/lib/libqgisgrass.so.{QGIS_ABI}
diff --git a/debian/qgis-plugin-grass.symbols b/debian/qgis-plugin-grass.symbols
@@ -0,0 +1,178 @@
+libqgisgrass.so.1.4.0 qgis-plugin-grass #MINVER#
+ _ZN10QByteArray4dataEv@Base 1.4.0
+ _ZN10QByteArrayD1Ev@Base 1.4.0
+ _ZN11QStringListD1Ev@Base 1.4.0
+ _ZN15QgsDataProvider12subsetStringEv@Base 1.4.0
+ _ZN15QgsDataProvider13setLayerOrderE11QStringList@Base 1.4.0
+ _ZN15QgsDataProvider13updateExtentsEv@Base 1.4.0
+ _ZN15QgsDataProvider15setSubsetStringE7QString@Base 1.4.0
+ _ZN15QgsDataProvider16setDataSourceUriERK7QString@Base 1.4.0
+ _ZN15QgsDataProvider21setSubLayerVisibilityE7QStringb@Base 1.4.0
+ _ZN16QgsGrassProvider10attributesEii@Base 1.4.0
+ _ZN16QgsGrassProvider10closeLayerEi@Base 1.4.0
+ _ZN16QgsGrassProvider10deleteLineEi@Base 1.4.0
+ _ZN16QgsGrassProvider10executeSqlEiRK7QString@Base 1.4.0
+ _ZN16QgsGrassProvider10grassLayerE7QString@Base 1.4.0
+ _ZN16QgsGrassProvider10grassLayerEv@Base 1.4.0
+ _ZN16QgsGrassProvider10nodeNLinesEi@Base 1.4.0
+ _ZN16QgsGrassProvider10numDbLinksEv@Base 1.4.0
+ _ZN16QgsGrassProvider11createTableEiRK7QStringS2_@Base 1.4.0
+ _ZN16QgsGrassProvider11dbLinkFieldEi@Base 1.4.0
+ _ZN16QgsGrassProvider11mapOutdatedEi@Base 1.4.0
+ _ZN16QgsGrassProvider11nextFeatureER10QgsFeature@Base 1.4.0
+ _ZN16QgsGrassProvider11rewriteLineEiiP9line_pntsP9line_cats@Base 1.4.0
+ _ZN16QgsGrassProvider11updatedLineEi@Base 1.4.0
+ _ZN16QgsGrassProvider11updatedNodeEi@Base 1.4.0
+ _ZN16QgsGrassProvider12centroidAreaEi@Base 1.4.0
+ _ZN16QgsGrassProvider12minimumValueEi@Base 1.4.0
+ _ZN16QgsGrassProvider13cidxGetMaxCatEi@Base 1.4.0
+ _ZN16QgsGrassProvider14grassLayerTypeE7QString@Base 1.4.0
+ _ZN16QgsGrassProvider14loadAttributesER6GLAYER@Base 1.4.0
+ _ZN16QgsGrassProvider14resetSelectionEb@Base 1.4.0
+ _ZN16QgsGrassProvider15isGrassEditableEv@Base 1.4.0
+ _ZN16QgsGrassProvider15numUpdatedLinesEv@Base 1.4.0
+ _ZN16QgsGrassProvider15numUpdatedNodesEv@Base 1.4.0
+ _ZN16QgsGrassProvider16cidxGetNumFieldsEv@Base 1.4.0
+ _ZN16QgsGrassProvider16deleteAttributesEii@Base 1.4.0
+ _ZN16QgsGrassProvider16insertAttributesEii@Base 1.4.0
+ _ZN16QgsGrassProvider16updateAttributesEiiRK7QString@Base 1.4.0
+ _ZN16QgsGrassProvider17allocateSelectionEP8Map_infoPPc@Base 1.4.0
+ _ZN16QgsGrassProvider18attributesOutdatedEi@Base 1.4.0
+ _ZN16QgsGrassProvider18cidxGetFieldNumberEi@Base 1.4.0
+ _ZN16QgsGrassProvider20setFeatureAttributesEiiP10QgsFeature@Base 1.4.0
+ _ZN16QgsGrassProvider20setFeatureAttributesEiiP10QgsFeatureRK5QListIiE@Base 1.4.0
+ _ZN16QgsGrassProvider23loadLayerSourcesFromMapER6GLAYER@Base 1.4.0
+ _ZN16QgsGrassProvider3crsEv@Base 1.4.0
+ _ZN16QgsGrassProvider3keyEi@Base 1.4.0
+ _ZN16QgsGrassProvider4thawEv@Base 1.4.0
+ _ZN16QgsGrassProvider5mMapsE@Base 1.4.0
+ _ZN16QgsGrassProvider6extentEv@Base 1.4.0
+ _ZN16QgsGrassProvider6freezeEv@Base 1.4.0
+ _ZN16QgsGrassProvider6rewindEv@Base 1.4.0
+ _ZN16QgsGrassProvider6selectE5QListIiE12QgsRectanglebb@Base 1.4.0
+ _ZN16QgsGrassProvider6updateEv@Base 1.4.0
+ _ZN16QgsGrassProvider7columnsEi@Base 1.4.0
+ _ZN16QgsGrassProvider7isValidEv@Base 1.4.0
+ _ZN16QgsGrassProvider7mLayersE@Base 1.4.0
+ _ZN16QgsGrassProvider7openMapE7QStringS0_S0_S0_@Base 1.4.0
+ _ZN16QgsGrassProvider8closeMapEi@Base 1.4.0
+ _ZN16QgsGrassProvider8findLineEddid@Base 1.4.0
+ _ZN16QgsGrassProvider8findNodeEddd@Base 1.4.0
+ _ZN16QgsGrassProvider8isEditedEv@Base 1.4.0
+ _ZN16QgsGrassProvider8isFrozenEv@Base 1.4.0
+ _ZN16QgsGrassProvider8isOrphanEiiPi@Base 1.4.0
+ _ZN16QgsGrassProvider8keyFieldEv@Base 1.4.0
+ _ZN16QgsGrassProvider8layerMapEi@Base 1.4.0
+ _ZN16QgsGrassProvider8maxValueEi@Base 1.4.0
+ _ZN16QgsGrassProvider8nodeCoorEiPdS0_@Base 1.4.0
+ _ZN16QgsGrassProvider8nodeLineEii@Base 1.4.0
+ _ZN16QgsGrassProvider8numLinesEv@Base 1.4.0
+ _ZN16QgsGrassProvider8numNodesEv@Base 1.4.0
+ _ZN16QgsGrassProvider8readLineEP9line_pntsP9line_catsi@Base 1.4.0
+ _ZN16QgsGrassProvider9addColumnEiRK7QString@Base 1.4.0
+ _ZN16QgsGrassProvider9closeEditEb@Base 1.4.0
+ _ZN16QgsGrassProvider9lineAliveEi@Base 1.4.0
+ _ZN16QgsGrassProvider9lineAreasEiPiS0_@Base 1.4.0
+ _ZN16QgsGrassProvider9lineNodesEiPiS0_@Base 1.4.0
+ _ZN16QgsGrassProvider9nodeAliveEi@Base 1.4.0
+ _ZN16QgsGrassProvider9openLayerE7QStringS0_S0_S0_i@Base 1.4.0
+ _ZN16QgsGrassProvider9reopenMapEv@Base 1.4.0
+ _ZN16QgsGrassProvider9startEditEv@Base 1.4.0
+ _ZN16QgsGrassProvider9updateMapEi@Base 1.4.0
+ _ZN16QgsGrassProvider9writeLineEiP9line_pntsP9line_cats@Base 1.4.0
+ _ZN16QgsGrassProviderC1E7QString@Base 1.4.0
+ _ZN16QgsGrassProviderC2E7QString@Base 1.4.0
+ _ZN16QgsGrassProviderD0Ev@Base 1.4.0
+ _ZN16QgsGrassProviderD1Ev@Base 1.4.0
+ _ZN16QgsGrassProviderD2Ev@Base 1.4.0
+ _ZN21QgsVectorDataProvider10enumValuesEiR11QStringList@Base 1.4.0
+ _ZN4GMAPC1ERKS_@Base 1.4.0
+ _ZN4GMAPD1Ev@Base 1.4.0
+ _ZN4QMapIi8QgsFieldE11node_createEP8QMapDataPPNS2_4NodeERKiRKS0_@Base 1.4.0
+ _ZN4QMapIi8QgsFieldE13detach_helperEv@Base 1.4.0
+ _ZN4QMapIi8QgsFieldE5clearEv@Base 1.4.0
+ _ZN4QMapIi8QgsFieldE8freeDataEP8QMapData@Base 1.4.0
+ _ZN5QListI7QStringE4freeEPN9QListData4DataE@Base 1.4.0
+ _ZN5QListI7QStringE5clearEv@Base 1.4.0
+ _ZN5QListI7QStringE6appendERKS0_@Base 1.4.0
+ _ZN6GLAYERD1Ev@Base 1.4.0
+ _ZN7QObject2trEPKcS1_@Base 1.4.0
+ _ZN7QStringC1EPKc@Base 1.4.0
+ _ZN7QStringC1ERKS_@Base 1.4.0
+ _ZN7QStringD1Ev@Base 1.4.0
+ _ZN8QgsGrass10activeModeEv@Base 1.4.0
+ _ZN8QgsGrass10openMapsetE7QStringS0_S0_@Base 1.4.0
+ _ZN8QgsGrass10resetErrorEv@Base 1.4.0
+ _ZN8QgsGrass11closeMapsetEv@Base 1.4.0
+ _ZN8QgsGrass11initializedE@Base 1.4.0
+ _ZN8QgsGrass11mMapsetLockE@Base 1.4.0
+ _ZN8QgsGrass11setLocationE7QStringS0_@Base 1.4.0
+ _ZN8QgsGrass11writeRegionE7QStringS0_S0_P9Cell_head@Base 1.4.0
+ _ZN8QgsGrass12errorMessageEv@Base 1.4.0
+ _ZN8QgsGrass12extendRegionEP9Cell_headS1_@Base 1.4.0
+ _ZN8QgsGrass12lockFilePathEv@Base 1.4.0
+ _ZN8QgsGrass12regionStringEP9Cell_head@Base 1.4.0
+ _ZN8QgsGrass12versionMajorEv@Base 1.4.0
+ _ZN8QgsGrass12versionMinorEv@Base 1.4.0
+ _ZN8QgsGrass13defaultMapsetE@Base 1.4.0
+ _ZN8QgsGrass13error_messageE@Base 1.4.0
+ _ZN8QgsGrass13error_routineEPKci@Base 1.4.0
+ _ZN8QgsGrass13error_routineEPci@Base 1.4.0
+ _ZN8QgsGrass13versionStringEv@Base 1.4.0
+ _ZN8QgsGrass14versionReleaseEv@Base 1.4.0
+ _ZN8QgsGrass15defaultGisdbaseE@Base 1.4.0
+ _ZN8QgsGrass15defaultLocationE@Base 1.4.0
+ _ZN8QgsGrass16copyRegionExtentEP9Cell_headS1_@Base 1.4.0
+ _ZN8QgsGrass16getDefaultMapsetEv@Base 1.4.0
+ _ZN8QgsGrass18getDefaultGisdbaseEv@Base 1.4.0
+ _ZN8QgsGrass18getDefaultLocationEv@Base 1.4.0
+ _ZN8QgsGrass19isValidGrassBaseDirE7QString@Base 1.4.0
+ _ZN8QgsGrass20copyRegionResolutionEP9Cell_headS1_@Base 1.4.0
+ _ZN8QgsGrass4initEv@Base 1.4.0
+ _ZN8QgsGrass4mTmpE@Base 1.4.0
+ _ZN8QgsGrass5errorEv@Base 1.4.0
+ _ZN8QgsGrass6activeE@Base 1.4.0
+ _ZN8QgsGrass6mGisrcE@Base 1.4.0
+ _ZN8QgsGrass6regionE7QStringS0_S0_P9Cell_head@Base 1.4.0
+ _ZN8QgsGrass7mapsetsE7QString@Base 1.4.0
+ _ZN8QgsGrass7mapsetsE7QStringS0_@Base 1.4.0
+ _ZN8QgsGrass7rastersE7QString@Base 1.4.0
+ _ZN8QgsGrass7rastersE7QStringS0_S0_@Base 1.4.0
+ _ZN8QgsGrass7vectorsE7QString@Base 1.4.0
+ _ZN8QgsGrass7vectorsE7QStringS0_S0_@Base 1.4.0
+ _ZN8QgsGrass8elementsE7QStringS0_@Base 1.4.0
+ _ZN8QgsGrass8elementsE7QStringS0_S0_S0_@Base 1.4.0
+ _ZN8QgsGrass8isMapsetE7QString@Base 1.4.0
+ _ZN8QgsGrass9ExceptionD0Ev@Base 1.4.0
+ _ZN8QgsGrass9ExceptionD1Ev@Base 1.4.0
+ _ZN8QgsGrass9lastErrorE@Base 1.4.0
+ _ZN8QgsGrass9locationsE7QString@Base 1.4.0
+ _ZN8QgsGrass9mapRegionEi7QStringS0_S0_S0_P9Cell_head@Base 1.4.0
+ _ZN8QgsGrass9setMapsetE7QStringS0_S0_@Base 1.4.0
+ _ZNK15QgsDataProvider13dataSourceUriEv@Base 1.4.0
+ _ZNK15QgsDataProvider13subLayerCountEv@Base 1.4.0
+ _ZNK15QgsDataProvider14subLayerStylesEv@Base 1.4.0
+ _ZNK15QgsDataProvider17fileRasterFiltersEv@Base 1.4.0
+ _ZNK15QgsDataProvider17fileVectorFiltersEv@Base 1.4.0
+ _ZNK15QgsDataProvider9subLayersEv@Base 1.4.0
+ _ZNK16QgsGrassProvider10fieldCountEv@Base 1.4.0
+ _ZNK16QgsGrassProvider11descriptionEv@Base 1.4.0
+ _ZNK16QgsGrassProvider11storageTypeEv@Base 1.4.0
+ _ZNK16QgsGrassProvider12featureCountEv@Base 1.4.0
+ _ZNK16QgsGrassProvider12geometryTypeEv@Base 1.4.0
+ _ZNK16QgsGrassProvider4nameEv@Base 1.4.0
+ _ZNK16QgsGrassProvider6fieldsEv@Base 1.4.0
+ _ZNSt6vectorI4GMAPSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.4.0
+ _ZNSt6vectorI4GMAPSaIS0_EED1Ev@Base 1.4.0
+ _ZNSt6vectorI6GLAYERSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.4.0
+ _ZNSt6vectorI6GLAYERSaIS0_EED1Ev@Base 1.4.0
+ _ZNSt6vectorI8QgsFieldSaIS0_EE13_M_insert_auxEN9__gnu_cxx17__normal_iteratorIPS0_S2_EERKS0_@Base 1.4.0
+ _ZTI16QgsGrassProvider@Base 1.4.0
+ _ZTIN8QgsGrass9ExceptionE@Base 1.4.0
+ _ZTS16QgsGrassProvider@Base 1.4.0
+ _ZTSN8QgsGrass9ExceptionE@Base 1.4.0
+ _ZTV16QgsGrassProvider@Base 1.4.0
+ _ZTVN8QgsGrass9ExceptionE@Base 1.4.0
+ _ZplPKcRK7QString@Base 1.4.0
+ _ZplRK7QStringPKc@Base 1.4.0
+ _ZplRK7QStringS1_@Base 1.4.0
diff --git a/debian/qgis.sh b/debian/qgis.sh
@@ -1,12 +1,11 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH=/usr/lib/grass/lib
-export LD_LIBRARY_PATH
-
 if [ "$LD_LIBRARY_PATH" = "" ]; then
 	LD_LIBRARY_PATH=/usr/lib/grass/lib:/usr/lib/grass64/lib
 else
 	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass/lib:/usr/lib/grass64/lib
 fi
 
+export LD_LIBRARY_PATH
+
 exec $0.bin "$@"
diff --git a/debian/rules b/debian/rules
@@ -58,18 +58,14 @@ endif
 define gentemplate
 $(2): $(1)
 	sed \
-		-e "s/{QGIS_ABI}/$(QGIS_ABI)/" \
-		-e "s/{GRASS_ABI}/$(GRASS_ABI)/" $$^ >$$@
+		-e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \
+		-e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@
 endef
 
-TEMPLATES := $(patsubst %.$(DISTRIBUTION),%,$(wildcard debian/*.$(DISTRIBUTION)))
-TEMPLATES += $(patsubst %.in,%,$(wildcard debian/*.in))
+TEMPLATES := $(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(basename $(t)))
 TEMPLATES += $(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))
 
-templates: $(TEMPLATES)
-
-$(eval $(call gentemplate,debian/%.$(DISTRIBUTION),debian/%))
-$(eval $(call gentemplate,debian/%.in,debian/%))
+$(foreach t,$(wildcard debian/*.in debian/*.$(DISTRIBUTION)),$(eval $(call gentemplate,$(t),$(basename $(t)))))
 $(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))
 
 debian/build/CMakeCache.txt: CMakeLists.txt
@@ -89,7 +85,7 @@ build-stamp: debian/build/CMakeCache.txt
 
 	touch $@
 
-clean: templates
+clean: $(TEMPLATES)
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
@@ -157,4 +153,4 @@ endif
 	dh_builddeb
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install templates
+.PHONY: build clean binary-indep binary-arch binary install debian/control