From: Joel Brobecker <brobecker@gnat.com>
Date: Sat, 17 Aug 2013 01:07:52 +0000 (+0000)
Subject: src-release: Strip "-cvs" from GDB source dir and tarball.
X-Git-Tag: binutils-2_24-branchpoint~256
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f006cabd5c8fa8486920f899761ebfc39cdd8f44;p=thirdparty%2Fbinutils-gdb.git

src-release: Strip "-cvs" from GDB source dir and tarball.

The nightly snapshots we have been creating in the past did not
include the "-cvs" suffix at the end of the version number. Snapshot
packaging started breaking ever since GDB switched to using BFD's
version number. Things got partially fixed with the previous change
to this file, but the change missed the fact that the "-cvs" suffix
in the tarball name (Eg: gdb-7.6.50-20130816-cvs.tar) is undesirable.
This patch removes it.

ChangeLog:

        * src-release (VER): When using $(TOOL)/common/create-version.sh,
        strip the "-cvs" suffix from the version number if present.
---

diff --git a/ChangeLog b/ChangeLog
index 23cf56b9651..f390fa43479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-16  Joel Brobecker  <brobecker@adacore.com>
+
+	* src-release (VER): When using $(TOOL)/common/create-version.sh,
+	strip the "-cvs" suffix from the version number if present.
+
 2013-08-12  Jan-Benedict Glaw  <jbglaw@lug-owl.de>
 
 	* configure.ac: Sync with GCC repo.
diff --git a/src-release b/src-release
index cf6d266a22d..c2f4727b35e 100644
--- a/src-release
+++ b/src-release
@@ -74,7 +74,7 @@ VER = `	if grep 'AM_INIT_AUTOMAKE.*BFD_VERSION' $(TOOL)/configure.in >/dev/null
 	  $(TOOL)/common/create-version.sh $(TOOL) \
 	    'dummy-host' 'dummy-target' \
 	    VER.tmp; \
-	  cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/'; \
+	  cat VER.tmp | grep 'version\[\]' | sed 's/.*"\([^"]*\)".*/\1/' | sed 's/-cvs$$//'; \
           rm -f VER.tmp; \
 	elif test -f $(TOOL)/version.in; then \
 	  head -1 $(TOOL)/version.in; \