From: Patrick Rouleau <prouleau72@gmail.com>
Date: Mon, 30 Sep 2013 04:10:50 +0000 (-0400)
Subject: Update version extraction for _version.py to work with the new tag syntax.
X-Git-Tag: 0.25-rc4~54
X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67a38a4671e1b81ffd96b4109395a51cc2f4bbcb;p=bup.git

Update version extraction for _version.py to work with the new tag syntax.

The version tag used to be in the form "bup-<version>".

The syntax is now just "<version>" to allow github to produce
reasonable archives (i.e. not bup-bup-VERSION).

Signed-off-by: Patrick Rouleau <prouleau72@gmail.com>
Reviewed-by: Gabriel Filion <gabster@lelutin.ca>
[rlb@defaultvalue.org: adjust commit message.]
Reviewed-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/format-subst.pl b/format-subst.pl
index 8b834c4..e91c3b8 100755
--- a/format-subst.pl
+++ b/format-subst.pl
@@ -12,8 +12,8 @@ while (<>) {
     s{
 	\$Format:\%d\$
     }{
-	my $tag = fix(`git describe --match="bup-*"`);
-	"(tag: $tag)"
+	my $tag = fix(`git describe --match="[0-9]*"`);
+	"(tag: bup-$tag)"
     }ex;
     
     s{