debian packaging: fix templates (fixes #14248)

qgis · Feb 9, 2016 · 41ac88a · 41ac88a
1 parent fa78ccf
commit 41ac88a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/debian/control.in b/debian/control.in
@@ -84,7 +84,6 @@ Recommends:
  qgis-provider-grass,
  qgis-plugin-globe
 Suggests: gpsbabel
-Conflicts: uim-qt3
 Replaces: qgis-plugin-grass (<< 1:2.13.0+git20160204)
 Conflicts: uim-qt3, qgis-plugin-grass (<< 1:2.13.0+git20160204)
 Description: Geographic Information System (GIS)

diff --git a/debian/rules b/debian/rules
@@ -210,7 +210,7 @@ cleantemplates:
 	$(MAKE) -f debian/rules templateclean
 	$(MAKE) -f debian/rules debian/control debian/compat
 
-binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
+binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep: templates
 	dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR)
 
 override_dh_clean: cleantemplates
@@ -222,7 +222,7 @@ override_dh_clean: cleantemplates
 
 	-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/
 
-override_dh_auto_configure: templates
+override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_OPTS)
 
 override_dh_auto_test: test-stamp