diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2008-07-07 16:07:43 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2008-07-07 16:12:28 -0400 |
| commit | ab06396f70939ae5a35ea7e7205ee3cd19e61aea (patch) | |
| tree | 992a82123599bb961e3178eced2f25a051e6fa98 | |
| parent | c03d99242901fccfb597d8bbc674899a8f22075d (diff) | |
| download | e2fsprogs-ab06396f70939ae5a35ea7e7205ee3cd19e61aea.tar.gz | |
debian: Create debian release tarball to obey new WIP naming convention
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | util/gen-tarball.in | 13 |
3 files changed, 13 insertions, 6 deletions
@@ -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 9a43f995..c16893e6 100644 --- 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 8dcaf040..e550e2cb 100644 --- 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 |