[PATCH 4/6] build-system: use signed tag to make tar file, if available.

diff --git a/5c/6bb8087d977c78a82fd5f62346fbfb9f4ab291 b/5c/6bb8087d977c78a82fd5f62346fbfb9f4ab291
new file mode 100644 (file)
index 0000000..e7f570e
--- /dev/null
+++ b/5c/6bb8087d977c78a82fd5f62346fbfb9f4ab291
@@ -0,0 +1,84 @@
+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 87703429E32\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:04:02 -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 FLPg2QDASyoq for <notmuch@notmuchmail.org>;\r
+       Mon,  4 Jul 2011 05:04:01 -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 33ABD429E31\r
+       for <notmuch@notmuchmail.org>; Mon,  4 Jul 2011 05:04:00 -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 p64C3uj6027978\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);\r
+       Mon, 4 Jul 2011 09:03:57 -0300\r
+Received: from bremner by zancas.localnet with local (Exim 4.76)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1Qdhsa-0008Mp-PL; Mon, 04 Jul 2011 09:03:56 -0300\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/6] build-system: use signed tag to make tar file,\r
+       if available.\r
+Date: Mon,  4 Jul 2011 09:03:39 -0300\r
+Message-Id: <1309781021-32062-5-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:02 -0000\r
+\r
+From: David Bremner <bremner@debian.org>\r
+\r
+This as the advantage that "make VERSION=n.m dist" will work correctly\r
+even if the wrong branch happens to be checked out.\r
+---\r
+ Makefile.local |    8 +++++++-\r
+ 1 files changed, 7 insertions(+), 1 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index b6445e5..d1c0737 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -60,7 +60,13 @@ endif\r
+ endif\r
+ \r
+ $(TAR_FILE):\r
+-      git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ HEAD > $(TAR_FILE).tmp\r
++      if git tag -v $(VERSION) >/dev/null 2>&1; then \\r
++           ref=$(VERSION); \\r
++        else \\r
++           ref="HEAD" ; \\r
++         echo "Warning: No signed tag for $(VERSION)"; \\r
++      fi ; \\r
++      git archive --format=tar --prefix=$(PACKAGE)-$(VERSION)/ $$ref > $(TAR_FILE).tmp\r
+       echo $(VERSION) > version.tmp\r
+       tar --append -f $(TAR_FILE).tmp --transform s_^_$(PACKAGE)-$(VERSION)/_  --transform 's_.tmp$$__' version.tmp\r
+       rm version.tmp\r
+-- \r
+1.7.5.4\r
+\r