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 6057422..6199f1d 100644 (file)
--- 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 1899ff3..cf162c0 100644 (file)
--- 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"
                ;;