debian: Create debian release tarball to obey new WIP naming convention

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/configure b/configure
index 7ec9091bafed92005e00c4d063da352cd1d692f9..898225899e1852c6b43ab09ba0defad66882dd8e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1906,8 +1906,7 @@ date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
 
 case $E2FSPROGS_VERSION in
 *-WIP|pre-*)
-       pre_vers=`echo $base_ver 0.01 - p | dc`
-       E2FSPROGS_PKGVER="$pre_vers+${base_ver}_WIP_$date_spec"
+       E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
        ;;
 *)
        E2FSPROGS_PKGVER="$base_ver"

diff --git a/configure.in b/configure.in
index 9a43f9954de7d70982074011ce39c99651e28605..c16893e69af8101b495ec6fcf20f23c5703530b5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -46,8 +46,7 @@ date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
 
 case $E2FSPROGS_VERSION in
 *-WIP|pre-*)
-       pre_vers=`echo $base_ver 0.01 - p | dc`
-       E2FSPROGS_PKGVER="$pre_vers+${base_ver}_WIP_$date_spec"
+       E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
        ;;
 *)
        E2FSPROGS_PKGVER="$base_ver"

diff --git a/util/gen-tarball.in b/util/gen-tarball.in
index 8dcaf0406ffeb04a9b1980b2a5bfb718be487508..e550e2cb049fa503a860b201e307af48d70b2648 100644 (file)
--- a/util/gen-tarball.in
+++ b/util/gen-tarball.in
@@ -9,12 +9,18 @@ base_ver=`echo @E2FSPROGS_VERSION@ | sed -e 's/-WIP//' -e 's/pre-//' -e 's/-PLUS
 base_e2fsprogs=`basename $top_dir`
 exclude=/tmp/exclude
 
-deb_pkgver=`echo @E2FSPROGS_PKGVER@ | sed -e 's/_/-/g'`
-echo Debian package $deb_pkgver
+#
+# This hack is needed because texi2dvi blows up horribly if there are 
+# any '~' chracters in the directory pathname.  So we kludge around it by
+# using a non-standard directory name for WIP releases.  dpkg-source
+# complains, but life goes on.
+#
+deb_pkgver=`echo @E2FSPROGS_PKGVER@ | sed -e 's/~/-/g'`
     
 case $1 in
     debian|ubuntu)
        SRCROOT="e2fsprogs-$deb_pkgver"
+       rename_tarball="e2fsprogs_@E2FSPROGS_PKGVER@.orig.tar.gz"
        list=all
        ;;
     subset)
@@ -43,3 +49,6 @@ sed -e "s;^;$SRCROOT/;" < $srcdir/$list.exclude >> $exclude
 
 (cd $top_srcdir/.. ; rm -f $SRCROOT)
 mv $top_srcdir/e2fsprogs.spec ../e2fsprogs.spec 
+if test -n "$rename_tarball"; then
+    mv $SRCROOT.tar.gz $rename_tarball
+fi