1 Return-Path: <bremner@tethera.net>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 3DC4C429E32
\r
6 for <notmuch@notmuchmail.org>; Mon, 4 Jul 2011 05:04:00 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id UUfNc3Vlab3H for <notmuch@notmuchmail.org>;
\r
16 Mon, 4 Jul 2011 05:03:59 -0700 (PDT)
\r
17 Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21])
\r
18 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 23700429E2B
\r
21 for <notmuch@notmuchmail.org>; Mon, 4 Jul 2011 05:03:57 -0700 (PDT)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc30w-142167177149.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [142.167.177.149]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p64C3s6j027963
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Mon, 4 Jul 2011 09:03:54 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.76)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1QdhsX-0008Mk-Pm; Mon, 04 Jul 2011 09:03:53 -0300
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 2/6] build-system: remove calls to git-buildpackage and dput
\r
35 Date: Mon, 4 Jul 2011 09:03:37 -0300
\r
36 Message-Id: <1309781021-32062-3-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.5.4
\r
38 In-Reply-To: <1309781021-32062-1-git-send-email-david@tethera.net>
\r
39 References: <1309781021-32062-1-git-send-email-david@tethera.net>
\r
40 Cc: David Bremner <bremner@debian.org>
\r
41 X-BeenThere: notmuch@notmuchmail.org
\r
42 X-Mailman-Version: 2.1.13
\r
44 List-Id: "Use and development of the notmuch mail system."
\r
45 <notmuch.notmuchmail.org>
\r
46 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
47 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
48 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
49 List-Post: <mailto:notmuch@notmuchmail.org>
\r
50 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
51 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
52 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
53 X-List-Received-Date: Mon, 04 Jul 2011 12:04:00 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 The removed code had the following issues:
\r
59 - It depends on the users git-buildpackage configuration to put the
\r
60 results in the correct place, so is fragile.
\r
62 - The tar file is overwritten in the next step, so copying it is not
\r
65 - We should build the final version of the debian package in a chroot,
\r
66 using e.g. pbuilder or sbuild.
\r
68 I added a call to "make clean", so that we are sure the code is
\r
69 completely rebuilt before testing.
\r
71 Makefile.local | 7 +------
\r
72 1 files changed, 1 insertions(+), 6 deletions(-)
\r
74 diff --git a/Makefile.local b/Makefile.local
\r
75 index 41feeb3..dea813c 100644
\r
76 --- a/Makefile.local
\r
77 +++ b/Makefile.local
\r
78 @@ -87,18 +87,13 @@ dist: $(TAR_FILE)
\r
80 release: verify-source-tree-and-version
\r
81 $(MAKE) VERSION=$(VERSION) verify-newer
\r
82 + $(MAKE) VERSION=$(VERSION) clean
\r
83 $(MAKE) VERSION=$(VERSION) test
\r
84 - rm -rf ./debian-build
\r
86 - cp debian-build/notmuch_$(VERSION).tar.gz notmuch-$(VERSION).tar.gz
\r
87 $(MAKE) VERSION=$(VERSION) $(GPG_FILE)
\r
88 scp $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) $(RELEASE_HOST):$(RELEASE_DIR)
\r
89 ssh $(RELEASE_HOST) "rm -f $(RELEASE_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(TAR_FILE) $(RELEASE_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
\r
91 mv $(TAR_FILE) $(SHA1_FILE) $(GPG_FILE) releases
\r
92 - (cd debian-build; dput *.changes)
\r
93 - mv debian-build/* releases
\r
94 - rmdir debian-build
\r
95 git tag -s -m "$(PACKAGE) $(VERSION) release" $(VERSION)
\r
96 git push origin $(VERSION)
\r
97 $(MAKE) VERSION=$(VERSION) release-message > $(PACKAGE)-$(VERSION).announce
\r