Skip to content
Permalink
Browse files

debian packaging: fix templates (fixes #14248)

  • Loading branch information
jef-n committed Feb 9, 2016
1 parent fa78ccf commit 41ac88ad3e1d21f759bd4b36268273f58af48bf5
Showing with 2 additions and 3 deletions.
  1. +0 −1 debian/control.in
  2. +2 −2 debian/rules
@@ -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)
@@ -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

0 comments on commit 41ac88a

Please sign in to comment.
You can’t perform that action at this time.