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 788F3429E29
\r
6 for <notmuch@notmuchmail.org>; Wed, 12 Oct 2011 18:23:53 -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 2-WPNp4s57S2 for <notmuch@notmuchmail.org>;
\r
16 Wed, 12 Oct 2011 18:23:52 -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 17F25429E27
\r
21 for <notmuch@notmuchmail.org>; Wed, 12 Oct 2011 18:23:51 -0700 (PDT)
\r
22 Received: from zancas.localnet
\r
23 (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net
\r
24 [156.34.64.58]) (authenticated bits=0)
\r
25 by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9D1Nkae007496
\r
26 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO);
\r
27 Wed, 12 Oct 2011 22:23:47 -0300
\r
28 Received: from bremner by zancas.localnet with local (Exim 4.76)
\r
29 (envelope-from <bremner@tethera.net>)
\r
30 id 1REA1S-000417-6M; Wed, 12 Oct 2011 22:23:46 -0300
\r
31 From: david@tethera.net
\r
32 To: notmuch@notmuchmail.org
\r
33 Subject: [PATCH 1/2] build system: remove dashes from git-describe generated
\r
35 Date: Wed, 12 Oct 2011 22:23:32 -0300
\r
36 Message-Id: <1318469013-15395-2-git-send-email-david@tethera.net>
\r
37 X-Mailer: git-send-email 1.7.6.3
\r
38 In-Reply-To: <1318469013-15395-1-git-send-email-david@tethera.net>
\r
39 References: <1318469013-15395-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: Thu, 13 Oct 2011 01:23:54 -0000
\r
55 From: David Bremner <bremner@debian.org>
\r
57 This makes it less confusing with released Debian versions, now that we have
\r
58 non-native Debian versions.
\r
60 Makefile.local | 2 +-
\r
61 1 files changed, 1 insertions(+), 1 deletions(-)
\r
63 diff --git a/Makefile.local b/Makefile.local
\r
64 index 38f6c17..2c07bd7 100644
\r
65 --- a/Makefile.local
\r
66 +++ b/Makefile.local
\r
67 @@ -17,7 +17,7 @@ ifneq ($(MAKECMDGOALS),release)
\r
68 ifneq ($(MAKECMDGOALS),release-message)
\r
69 ifneq ($(MAKECMDGOALS),pre-release)
\r
70 ifeq ($(IS_GIT),yes)
\r
71 -VERSION:=$(shell git describe --match '[0-9.]*')
\r
72 +VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/-/+/ -e s/-/~/)
\r