[qgis] 03/09: Drop upstream changes for multi distribution support & dh_auto_test override.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Mon Dec 21 11:45:45 UTC 2015


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 3060757dc8f0f44affec5c232c9535b64fac0e6a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Dec 21 02:34:37 2015 +0100

    Drop upstream changes for multi distribution support & dh_auto_test override.
---
 debian/rules | 47 ++---------------------------------------------
 1 file changed, 2 insertions(+), 45 deletions(-)

diff --git a/debian/rules b/debian/rules
index fe2e5dc..7ea9104 100755
--- a/debian/rules
+++ b/debian/rules
@@ -139,47 +139,7 @@ ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS)))
 	LDFLAGS += -pg
 endif
 
-
-# multi distribution support:
-# - remove lines with applicable excludes
-# - remove prefixes with applicable includes
-# - remove prefixes with not applicable excludes
-# - remove remaining comments
-
-CONTROL_EXPRESSIONS = $(DISTRIBUTION) grass$(GRASSVER)
-
-ifneq (,$(WITH_ORACLE))
-	CONTROL_EXPRESSIONS += oracle
-endif
-
-define gentemplate
-$(2): $(1)
-	sed -r \
-		-e '/#(.+ |)!($(subst $(eval) ,|,$(CONTROL_EXPRESSIONS)))( .+|)#/d' \
-		-e 's/#([^#]+ |)($(subst $(eval) ,|,$(CONTROL_EXPRESSIONS)))( [^#]+|)#//g' \
-		-e 's/#([^#]+ |)![^#]+( [^#]*|)#//g' \
-		-e '/^#/d' \
-		-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
-		-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
-		-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
-		-e "s/\{GRASS\}/$(GRASS)/g" \
-		-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
-		$$^ >$$@
-
-templates:: $(2)
-
-templateclean::
-	rm -f $(2)
-endef
-
-$(foreach t,$(wildcard debian/*.in),$(eval $(call gentemplate,$(t),$(basename $(t)))))
-$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))
-
-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:
+%:
 	dh $@ --with python2 --parallel --builddirectory=$(QGIS_BUILDDIR)
 
 override_dh_clean:
@@ -200,9 +160,7 @@ override_dh_auto_build-arch:
 override_dh_auto_build-indep:
 	cd obj-* && doxygen doc/Doxyfile ; cd -
 
-override_dh_auto_test: test-stamp
-
-test-stamp:
+override_dh_auto_test:
 ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 	# Code to run the package test suite - and ignore the outcome for now
 	mkdir -p debian/tmp/locale/
@@ -215,7 +173,6 @@ ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 else
 	@echo Skipping tests.
 endif
-	touch test-stamp
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git



More information about the Pkg-grass-devel mailing list