[PATCH 2/6] build-system: remove calls to git-buildpackage and dput in release target.

david at tethera.net david at tethera.net
Mon Jul 4 05:03:37 PDT 2011


From: David Bremner <bremner at debian.org>

The removed code had the following issues:

- It depends on the users git-buildpackage configuration to put the
results in the correct place, so is fragile.

- The tar file is overwritten in the next step, so copying it is not
  useful.

- We should build the final version of the debian package in a chroot,
  using e.g. pbuilder or sbuild.

I added a call to "make clean", so that we are sure the code is
completely rebuilt before testing.
---
 Makefile.local |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/Makefile.local b/Makefile.local
index 41feeb3..dea813c 100644
--- a/Makefile.local
+++ b/Makefile.local
@@ -87,18 +87,13 @@ dist: $(TAR_FILE)
 .PHONY: release
 release: verify-source-tree-and-version
 	$(MAKE) VERSION=$(VERSION) verify-newer
+	$(MAKE) VERSION=$(VERSION) clean
 	$(MAKE) VERSION=$(VERSION) test
-	rm -rf ./debian-build
-	git-buildpackage
-	cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz
 	$(MAKE) VERSION=$(VERSION) $(GPG_FILE)
 	scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
 	ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 	mkdir -p releases
 	mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
-	(cd debian-build; dput *.changes)
-	mv debian-build/* releases
-	rmdir debian-build
 	git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
 	git push origin $(VERSION)
 	$(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
-- 
1.7.5.4



More information about the notmuch mailing list