Nicolas Bock has proposed merging ~nicolasbock/ubuntu/+source/daily-build:propertree into ~ubuntu-support-team/ubuntu/+source/daily-build:propertree.
Requested reviews: Ubuntu Support Team (ubuntu-support-team) For more details, see: https://code.launchpad.net/~nicolasbock/ubuntu/+source/daily-build/+git/daily-build/+merge/447037 -- Your team Ubuntu Support Team is requested to review the proposed merge of ~nicolasbock/ubuntu/+source/daily-build:propertree into ~ubuntu-support-team/ubuntu/+source/daily-build:propertree.
diff --git a/debian/daily-build-rules b/debian/daily-build-rules deleted file mode 100644 index 84a8d5b..0000000 --- a/debian/daily-build-rules +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/make -f - -DAILY_BUILD_FULLNAME=Daily Builder [email protected] - -ifneq ($(shell dpkg-parsechangelog -S Maintainer),$(DAILY_BUILD_FULLNAME) <$(DAILY_BUILD_EMAIL)>) - -include debian/daily-build-vars - -# What commit do we want to describe? -# For nested git-build-recipes, we can just use HEAD; for merges, we need to use the branch -# The branch should be set in the -vars file if needed, as this will default to HEAD -DAILY_BUILD_GIT_SHOW_REF:=$(if $(and $(DAILY_BUILD_GIT_REMOTE),$(DAILY_BUILD_GIT_BRANCH)),$(DAILY_BUILD_GIT_REMOTE)/$(DAILY_BUILD_GIT_BRANCH),NONE) -DAILY_BUILD_GIT_DESCRIBE_REF:=$(or $(shell git show-ref --hash $(DAILY_BUILD_GIT_SHOW_REF)),HEAD) - -DAILY_BUILD_GIT_CAN_DESCRIBE:=$(shell git describe --tags $(DAILY_BUILD_GIT_DESCRIBE_REF) >/dev/null 2>&1 && echo 1) -ifeq (,$(or $(DAILY_BUILD_GIT_CAN_DESCRIBE),$(DAILY_BUILD_GIT_FAKE_TAG_COMMIT))) -# No tag to describe this ref, we need to set the fake tag, hopefully there is only 1 'initial' comment (with 0 parents) -DAILY_BUILD_GIT_FAKE_TAG_COMMIT:=$(shell git rev-list --max-parents=0 $(DAILY_BUILD_GIT_DESCRIBE_REF)) -endif - -ifneq (,$(DAILY_BUILD_GIT_FAKE_TAG_COMMIT)) -# We're adding a fake tag at this commit, and using that with describe -DAILY_BUILD_GIT_FAKE_TAG:=DAILY_BUILD_$(or $(DAILY_BUILD_GIT_FAKE_TAG_VERSION),1.0.0) -DAILY_BUILD_GIT_DESCRIBE_SED:=s/^DAILY_BUILD_// -DAILY_BUILD_GIT_CREATE_TAG:=$(shell git tag '$(DAILY_BUILD_GIT_FAKE_TAG)' $(DAILY_BUILD_GIT_FAKE_TAG_COMMIT)) -DAILY_BUILD_GIT_DESCRIBE_VERSION:=$(shell git describe --abbrev=12 --tags --long --match '$(DAILY_BUILD_GIT_FAKE_TAG)' $(DAILY_BUILD_GIT_DESCRIBE_REF)) -DAILY_BUILD_GIT_REMOVE_TAG:=$(shell git tag -d '$(DAILY_BUILD_GIT_FAKE_TAG)') -else -DAILY_BUILD_GIT_DESCRIBE_VERSION:=$(shell git describe --abbrev=12 --tags --long $(DAILY_BUILD_GIT_DESCRIBE_REF)) -endif - -DAILY_BUILD_EPOCH:=$(shell dpkg-parsechangelog -S Version | grep -oE '^.*:') -DAILY_BUILD_RELEASE_CODENAME:=$(shell lsb_release -cs) -DAILY_BUILD_RELEASE_VERSION:=$(shell lsb_release -rs) -DAILY_BUILD_TIMESTAMP:=$(shell date -u +%Y%m%d%H%M%S) -DAILY_BUILD_GIT_VERSION:=$(shell echo $(DAILY_BUILD_GIT_DESCRIBE_VERSION) | sed -e '$(DAILY_BUILD_GIT_DESCRIBE_SED)' | sed -e 's/[-_]/./g' | sed -E -e 's/\.?rc/~rc/i') -DAILY_BUILD_VERSION:=$(DAILY_BUILD_EPOCH)$(DAILY_BUILD_GIT_VERSION)+$(DAILY_BUILD_RELEASE_VERSION).$(DAILY_BUILD_TIMESTAMP) -DAILY_BUILD_DCH:=dch --noconf -b -v $(DAILY_BUILD_VERSION) -D $(DAILY_BUILD_RELEASE_CODENAME) "Daily build" -DAILY_BUILD_UPDATE_CHANGELOG:=$(shell env DEBFULLNAME='$(DAILY_BUILD_FULLNAME)' DEBEMAIL='$(DAILY_BUILD_EMAIL)' $(DAILY_BUILD_DCH)) - -endif diff --git a/debian/daily-build-vars b/debian/daily-build-vars deleted file mode 100644 index b1b2c6c..0000000 --- a/debian/daily-build-vars +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/make -f - -# This assumes git tags are formatted like 'v1.0.0', adjust if needed -DAILY_BUILD_GIT_DESCRIBE_SED:=s/^v// - -# Leave this empty to use the current branch -# This can be left empty for a 'nested' recipe, but should be set for a 'merged' recipe -DAILY_BUILD_GIT_BRANCH:= - -# Try to find a remote named one of: -# 'source' (which is what git-build-recipe uses) -# 'upstream' (i.e. standard naming for an 'upstream' repo) -# 'origin' (i.e. the default remote repo name) -# This normally shouldn't need to be changed, since git-build-recipe always -# uses 'source', and 'upstream' or 'origin' are only here for local testing -# Note we can't use 'git remote' here because git-build-recipe doesn't actually -# create real remotes, so 'git remote' doesn't find any :( -DAILY_BUILD_GIT_REMOTE:=$(shell for remote in source upstream origin; do git branch -lr "$$remote/*" | grep -q $$remote && echo $$remote && break; done) diff --git a/debian/rules b/debian/rules index bbeb2b4..607ed4e 100755 --- a/debian/rules +++ b/debian/rules @@ -1,7 +1,5 @@ #!/usr/bin/make -f -include debian/daily-build-rules - export PYBUILD_NAME=propertree export PYBUILD_VERBOSE=1 export DH_VERBOSE=1
-- Mailing list: https://launchpad.net/~ubuntu-support-team Post to : [email protected] Unsubscribe : https://launchpad.net/~ubuntu-support-team More help : https://help.launchpad.net/ListHelp
