Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
debian packaging: fix templates (fixes #14248)
  • Loading branch information
jef-n committed Feb 9, 2016
1 parent fa78ccf commit 41ac88a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
1 change: 0 additions & 1 deletion debian/control.in
Expand Up @@ -84,7 +84,6 @@ Recommends:
qgis-provider-grass, qgis-provider-grass,
qgis-plugin-globe qgis-plugin-globe
Suggests: gpsbabel Suggests: gpsbabel
Conflicts: uim-qt3
Replaces: qgis-plugin-grass (<< 1:2.13.0+git20160204) Replaces: qgis-plugin-grass (<< 1:2.13.0+git20160204)
Conflicts: uim-qt3, qgis-plugin-grass (<< 1:2.13.0+git20160204) Conflicts: uim-qt3, qgis-plugin-grass (<< 1:2.13.0+git20160204)
Description: Geographic Information System (GIS) Description: Geographic Information System (GIS)
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Expand Up @@ -210,7 +210,7 @@ cleantemplates:
$(MAKE) -f debian/rules templateclean $(MAKE) -f debian/rules templateclean
$(MAKE) -f debian/rules debian/control debian/compat $(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) dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR)


override_dh_clean: cleantemplates override_dh_clean: cleantemplates
Expand All @@ -222,7 +222,7 @@ override_dh_clean: cleantemplates


-$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/ -$(RM) -r $(CURDIR)/$(QGIS_BUILDDIR)/


override_dh_auto_configure: templates override_dh_auto_configure:
dh_auto_configure -- $(CMAKE_OPTS) dh_auto_configure -- $(CMAKE_OPTS)


override_dh_auto_test: test-stamp override_dh_auto_test: test-stamp
Expand Down

0 comments on commit 41ac88a

Please sign in to comment.