mirror of https://github.com/vitalif/e2fsprogs
configure.ac: fix up Debian naming scheme for its orig.tar.gz file
We are using a new convention for the 1.43-WIP releases which should be less confusion by replacing the hyphens by periods (e.g., 1.43~WIP.2016.03.06 instead of 1.43~WIP-2016-03-06). This avoids confusion regarding the debian release number (which uses the last hyphen in the version string to separate the upstream version from the release number). Also fix a typo in the version number used in the debian changelog and e2fslibs.symbols file. Signed-off-by: Theodore Ts'o <tytso@mit.edu>debian
Theodore Ts'o
parent
9dd404897d
commit
2ab53829a2
|
|
@ -813,6 +813,7 @@ infodir
|
|||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
|
|
@ -934,6 +935,7 @@ datadir='${datarootdir}'
|
|||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE}'
|
||||
|
|
@ -1186,6 +1188,15 @@ do
|
|||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
|
|
@ -1323,7 +1334,7 @@ fi
|
|||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
|
|
@ -1476,6 +1487,7 @@ Fine tuning of the installation directories:
|
|||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
|
|
@ -2738,7 +2750,7 @@ E2FSPROGS_VERSION=`grep E2FSPROGS_VERSION ${srcdir}/version.h \
|
|||
| awk '{print $3}' | tr \" " " | awk '{print $1}'`
|
||||
DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
|
||||
| tr \" " "`
|
||||
E2FSPROGS_DAY=`echo $DATE | awk -F- '{print $1}'`
|
||||
E2FSPROGS_DAY=$(echo $DATE | awk -F- '{print $1}' | sed -e '/^[1-9]$/s/^/0/')
|
||||
MONTH=`echo $DATE | awk -F- '{print $2}'`
|
||||
YEAR=`echo $DATE | awk -F- '{print $3}'`
|
||||
|
||||
|
|
@ -2774,7 +2786,7 @@ date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
|
|||
|
||||
case $E2FSPROGS_VERSION in
|
||||
*-WIP|pre-*)
|
||||
E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
|
||||
E2FSPROGS_PKGVER="$base_ver~WIP.$date_spec"
|
||||
;;
|
||||
*)
|
||||
E2FSPROGS_PKGVER="$base_ver"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ E2FSPROGS_VERSION=`grep E2FSPROGS_VERSION ${srcdir}/version.h \
|
|||
| awk '{print $3}' | tr \" " " | awk '{print $1}'`
|
||||
DATE=`grep E2FSPROGS_DATE ${srcdir}/version.h | awk '{print $3}' \
|
||||
| tr \" " "`
|
||||
E2FSPROGS_DAY=`echo $DATE | awk -F- '{print $1}'`
|
||||
E2FSPROGS_DAY=$(echo $DATE | awk -F- '{print $1}' | sed -e '/^[[1-9]]$/s/^/0/')
|
||||
MONTH=`echo $DATE | awk -F- '{print $2}'`
|
||||
YEAR=`echo $DATE | awk -F- '{print $3}'`
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ date_spec=${E2FSPROGS_YEAR}.${MONTH_NUM}.${E2FSPROGS_DAY}
|
|||
|
||||
case $E2FSPROGS_VERSION in
|
||||
*-WIP|pre-*)
|
||||
E2FSPROGS_PKGVER="$base_ver~WIP-$E2FSPROGS_YEAR-$MONTH_NUM-$E2FSPROGS_DAY"
|
||||
E2FSPROGS_PKGVER="$base_ver~WIP.$date_spec"
|
||||
;;
|
||||
*)
|
||||
E2FSPROGS_PKGVER="$base_ver"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
e2fsprogs (1.43~WIP.2016.03-06-1) unstable; urgency=low
|
||||
e2fsprogs (1.43~WIP.2016.03.06-1) unstable; urgency=low
|
||||
|
||||
* New upstream release
|
||||
* Fix resize2fs bug that could leave block allocation bitmaps
|
||||
|
|
|
|||
|
|
@ -19,10 +19,10 @@ libe2p.so.2 e2fslibs #MINVER#
|
|||
e2p_uuid2str@Base 1.37
|
||||
e2p_uuid_to_str@Base 1.37
|
||||
fgetflags@Base 1.37
|
||||
fgetproject@Base 1.43~WIP.2016.03-06
|
||||
fgetproject@Base 1.43~WIP.2016.03.06
|
||||
fgetversion@Base 1.37
|
||||
fsetflags@Base 1.37
|
||||
fsetproject@Base 1.43~WIP.2016.03-06
|
||||
fsetproject@Base 1.43~WIP.2016.03.06
|
||||
fsetversion@Base 1.37
|
||||
getflags@Base 1.37
|
||||
getversion@Base 1.37
|
||||
|
|
@ -116,7 +116,7 @@ libext2fs.so.2 e2fslibs #MINVER#
|
|||
ext2fs_clear_bit64@Base 1.42
|
||||
ext2fs_clear_bit@Base 1.37
|
||||
ext2fs_clear_block_bitmap@Base 1.37
|
||||
ext2fs_clear_block_uninit@Base 1.43~WIP.2016.03-06
|
||||
ext2fs_clear_block_uninit@Base 1.43~WIP.2016.03.06
|
||||
ext2fs_clear_generic_bitmap@Base 1.41.0
|
||||
ext2fs_clear_generic_bmap@Base 1.42
|
||||
ext2fs_clear_inode_bitmap@Base 1.37
|
||||
|
|
@ -190,7 +190,7 @@ libext2fs.so.2 e2fslibs #MINVER#
|
|||
ext2fs_extent_open@Base 1.41.0
|
||||
ext2fs_extent_replace@Base 1.41.0
|
||||
ext2fs_extent_set_bmap@Base 1.41.0
|
||||
ext2fs_fallocate@Base 1.43~WIP.2016.03-06
|
||||
ext2fs_fallocate@Base 1.43~WIP.2016.03.06
|
||||
ext2fs_fast_clear_bit64@Base 1.42
|
||||
ext2fs_fast_clear_bit@Base 1.39
|
||||
ext2fs_fast_mark_block_bitmap2@Base 1.42
|
||||
|
|
@ -460,7 +460,7 @@ libext2fs.so.2 e2fslibs #MINVER#
|
|||
ext2fs_set_bit@Base 1.37
|
||||
ext2fs_set_bitmap_padding@Base 1.37
|
||||
ext2fs_set_block_alloc_stats_callback@Base 1.41.0
|
||||
ext2fs_set_block_alloc_stats_range_callback@Base 1.43~WIP.2016.03-06
|
||||
ext2fs_set_block_alloc_stats_range_callback@Base 1.43~WIP.2016.03.06
|
||||
ext2fs_set_block_bitmap_range2@Base 1.42
|
||||
ext2fs_set_block_bitmap_range@Base 1.41.0
|
||||
ext2fs_set_data_io@Base 1.37
|
||||
|
|
@ -474,7 +474,7 @@ libext2fs.so.2 e2fslibs #MINVER#
|
|||
ext2fs_set_inode_bitmap_range2@Base 1.42
|
||||
ext2fs_set_inode_bitmap_range@Base 1.41.0
|
||||
ext2fs_set_inode_callback@Base 1.37
|
||||
ext2fs_set_new_range_callback@Base 1.43~WIP.2016.03-06
|
||||
ext2fs_set_new_range_callback@Base 1.43~WIP.2016.03.06
|
||||
ext2fs_set_rec_len@Base 1.41.7
|
||||
ext2fs_sha512@Base 1.43~WIP.2015.05.18
|
||||
ext2fs_stat@Base 1.42
|
||||
|
|
|
|||
Loading…
Reference in New Issue