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

diff --git a/da/c115d3a475258cd79a3fd9712e9110544b11ab b/da/c115d3a475258cd79a3fd9712e9110544b11ab
new file mode 100644 (file)
index 0000000..db36d67
--- /dev/null
+++ b/da/c115d3a475258cd79a3fd9712e9110544b11ab
@@ -0,0 +1,100 @@
+Return-Path: <bremner@tethera.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3DC4C429E32\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:04:00 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id UUfNc3Vlab3H for <notmuch@notmuchmail.org>;\r
+       Mon,  4 Jul 2011 05:03:59 -0700 (PDT)\r
+Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 23700429E2B\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:03:57 -0700 (PDT)\r
+Received: from zancas.localnet\r
+       (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net\r
+       [142.167.177.149]) (authenticated bits=0)\r
+       by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p64C3s6j027963\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Mon, 4 Jul 2011 09:03:54 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1QdhsX-0008Mk-Pm; Mon, 04 Jul 2011 09:03:53 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/6] build-system: remove calls to git-buildpackage and dput\r
+       in release target.\r
+Date: Mon,  4 Jul 2011 09:03:37 -0300\r
+Message-Id: <1309781021-32062-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net>\r
+References: <1309781021-32062-1-git-send-email-david@tethera.net>\r
+Cc: David Bremner <bremner@debian.org>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 04 Jul 2011 12:04:00 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+The removed code had the following issues:\r
+\r
+- It depends on the users git-buildpackage configuration to put the\r
+results in the correct place, so is fragile.\r
+\r
+- The tar file is overwritten in the next step, so copying it is not\r
+  useful.\r
+\r
+- We should build the final version of the debian package in a chroot,\r
+  using e.g. pbuilder or sbuild.\r
+\r
+I added a call to "make clean", so that we are sure the code is\r
+completely rebuilt before testing.\r
+---\r
+ Makefile.local |    7 +------\r
+ 1 files changed, 1 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 41feeb3..dea813c 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -87,18 +87,13 @@ dist: $(TAR_FILE)\r
+ .PHONY: release\r
+ release: verify-source-tree-and-version\r
+       $(MAKE) VERSION=$(VERSION) verify-newer\r
++      $(MAKE) VERSION=$(VERSION) clean\r
+       $(MAKE) VERSION=$(VERSION) test\r
+-      rm -rf ./debian-build\r
+-      git-buildpackage\r
+-      cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz\r
+       $(MAKE) VERSION=$(VERSION) $(GPG_FILE)\r
+       scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)\r
+       ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"\r
+       mkdir -p releases\r
+       mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases\r
+-      (cd debian-build; dput *.changes)\r
+-      mv debian-build/* releases\r
+-      rmdir debian-build\r
+       git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)\r
+       git push origin $(VERSION)\r
+       $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce\r
+-- \r
+1.7.5.4\r
+\r