Return-Path: X-Original-To: notmuch@notmuchmail.org Delivered-To: notmuch@notmuchmail.org Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id 788F3429E29 for ; Wed, 12 Oct 2011 18:23:53 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at olra.theworths.org X-Spam-Flag: NO X-Spam-Score: -2.3 X-Spam-Level: X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5 tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled Received: from olra.theworths.org ([127.0.0.1]) by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2-WPNp4s57S2 for ; Wed, 12 Oct 2011 18:23:52 -0700 (PDT) Received: from tempo.its.unb.ca (tempo.its.unb.ca [131.202.1.21]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 17F25429E27 for ; Wed, 12 Oct 2011 18:23:51 -0700 (PDT) Received: from zancas.localnet (fctnnbsc36w-156034064058.pppoe-dynamic.High-Speed.nb.bellaliant.net [156.34.64.58]) (authenticated bits=0) by tempo.its.unb.ca (8.13.8/8.13.8) with ESMTP id p9D1Nkae007496 (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NO); Wed, 12 Oct 2011 22:23:47 -0300 Received: from bremner by zancas.localnet with local (Exim 4.76) (envelope-from ) id 1REA1S-000417-6M; Wed, 12 Oct 2011 22:23:46 -0300 From: david@tethera.net To: notmuch@notmuchmail.org Subject: [PATCH 1/2] build system: remove dashes from git-describe generated version. Date: Wed, 12 Oct 2011 22:23:32 -0300 Message-Id: <1318469013-15395-2-git-send-email-david@tethera.net> X-Mailer: git-send-email 1.7.6.3 In-Reply-To: <1318469013-15395-1-git-send-email-david@tethera.net> References: <1318469013-15395-1-git-send-email-david@tethera.net> Cc: David Bremner X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Oct 2011 01:23:54 -0000 From: David Bremner This makes it less confusing with released Debian versions, now that we have non-native Debian versions. --- Makefile.local | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.local b/Makefile.local index 38f6c17..2c07bd7 100644 --- a/Makefile.local +++ b/Makefile.local @@ -17,7 +17,7 @@ ifneq ($(MAKECMDGOALS),release) ifneq ($(MAKECMDGOALS),release-message) ifneq ($(MAKECMDGOALS),pre-release) ifeq ($(IS_GIT),yes) -VERSION:=$(shell git describe --match '[0-9.]*') +VERSION:=$(shell git describe --match '[0-9.]*'|sed -e s/-/+/ -e s/-/~/) endif endif endif -- 1.7.6.3