From: Theodore Ts'o <tytso@mit.edu>
Date: Sat, 8 Jan 2005 02:04:46 +0000 (-0500)
Subject: When generating tarballs for Debian builds, remove the hyphen in version
X-Git-Tag: E2FSPROGS-1_36~76
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1b30d17bf6c22b0fbf047c19cb0335592d6c767d;p=thirdparty%2Fe2fsprogs.git

When generating tarballs for Debian builds, remove the hyphen in version
numbers such as "1.36-rc1", since Debian can't deal with version numbers
with '-' characters in them.
---

diff --git a/util/ChangeLog b/util/ChangeLog
index 605742264..6199f1d7d 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-07  Theodore Ts'o  <tytso@mit.edu>
+
+	* gen-tarball.in: Remove the hyphen in 1.36-rc1, since Debian
+		version numbers can't have '-' in them.
+
 2004-11-30  Theodore Ts'o  <tytso@mit.edu>
 
 	* Makefile.in: Use Linux-kernel-style makefile output to make it
diff --git a/util/gen-tarball.in b/util/gen-tarball.in
index 1899ff3c9..cf162c032 100644
--- a/util/gen-tarball.in
+++ b/util/gen-tarball.in
@@ -56,6 +56,10 @@ case $1 in
 		deb_vers=`echo $base_ver 0.01 - p | dc`
 		SRCROOT="e2fsprogs-$deb_vers+$base_ver-WIP-$date_spec"
 		;;
+	*-rc*)
+		deb_vers=`echo @E2FSPROGS_VERSION@ | sed -e 's/-rc/rc/'`
+		SRCROOT="e2fsprogs-$deb_vers"
+		;;
 	*-PLUS)
 		SRCROOT="e2fsprogs-$base_ver+$date_spec"
 		;;