diff --git a/ChangeLog b/ChangeLog index 76c5b697..f44b4dc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-09-17 Theodore Ts'o + * Makefile.in: Remove XSI:isms for greater portability. + (Addresses Debian Bug #255589) + * config.guess, config.sub: Update to newer version from the FSF (2004-06-11) diff --git a/Makefile.in b/Makefile.in index d86f9231..82144b35 100644 --- a/Makefile.in +++ b/Makefile.in @@ -49,7 +49,7 @@ distclean-doc: install: subs all-libs-recursive install-progs-recursive \ install-shlibs-libs-recursive install-doc-libs # export MANPATH=$(DESTDIR)$(mandir); $(srcdir)/install-utils/compile_manpages - if test ! -d e2fsck -a ! -d debugfs -a ! -d misc -a ! -d ext2ed ; then $(MAKE) install-libs ; fi + if test ! -d e2fsck && test ! -d debugfs && test ! -d misc && test ! -d ext2ed ; then $(MAKE) install-libs ; fi uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs diff --git a/debian/e2fsprogs.initrd b/debian/e2fsprogs.initrd index cf238009..c1de6aee 100644 --- a/debian/e2fsprogs.initrd +++ b/debian/e2fsprogs.initrd @@ -16,7 +16,7 @@ if [ $rootdev != 256 ]; then fi umount -n /devfs > /dev/null 2>&1 umount -n /mnt > /dev/null 2>&1 - if test -n "$ext3root" -o -n "$ext2root" ; then + if test -n "$ext3root" || test -n "$ext2root" ; then mount -nt tmpfs tmpfs /etc echo >> /etc/fstab echo >> /etc/mtab diff --git a/debian/rules b/debian/rules index f3e2736f..59af6aed 100644 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) # find the version for the main package, from changelog file -MAIN_VERSION = $(shell head -1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g') +MAIN_VERSION = $(shell head -n 1 debian/changelog | cut '-d ' -f 2 | sed 's/[()]//g') # find versions for libraries going into their own packages, from their Makefile.in's, # and sonames for all libs COMERR_VERSION = $(shell grep ELF_VERSION lib/et/Makefile.in | cut '-d ' -f3) diff --git a/install-utils/ChangeLog b/install-utils/ChangeLog index d20f0310..3d41d6f8 100644 --- a/install-utils/ChangeLog +++ b/install-utils/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Theodore Ts'o + + * convfstab: Remove XSI:isms for greater portability. + (Addresses Debian Bug #255589) + 2004-02-28 Theodore Ts'o * Release of E2fsprogs 1.35 diff --git a/install-utils/convfstab b/install-utils/convfstab index 01938d63..11160bf7 100644 --- a/install-utils/convfstab +++ b/install-utils/convfstab @@ -22,7 +22,7 @@ do echo "Please remove it by hand." >&2 ;; * ) - if [ $# -gt 6 -o $# -lt 3 ] + if [ $# -gt 6 ] || [ $# -lt 3 ] then echo "Don't have a clue about \"$LINE\"." >&2 echo "$LINE" diff --git a/lib/ChangeLog b/lib/ChangeLog index 34d8b5a6..c9fa386d 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Theodore Ts'o + + * Makefile.dll-lib (jump): Remove XSI:isms for greater portability. + (Addresses Debian Bug #255589) + 2004-02-29 Brian Bergstrand * Makefile.bsd-lib, Makefile.darwin-lib: Define BSDLIB_PIC_FLAG diff --git a/lib/Makefile.dll-lib b/lib/Makefile.dll-lib index bac0c7eb..3ea520d4 100644 --- a/lib/Makefile.dll-lib +++ b/lib/Makefile.dll-lib @@ -48,7 +48,7 @@ jump/jump.vars: dll/jump.vars # If this hack doesn't work, try replacing it with a hardcoded path to # libgcc.a, or -lgcc. # -#DLL_LIBGCC ="`$(CC) -v 2>&1 | head -1 | \ +#DLL_LIBGCC ="`$(CC) -v 2>&1 | head -n 1 | \ # sed -e 's;[^/]*;;' -e 's/specs/libgcc.a/'`" DLL_LIBGCC ="`$(CC) --print-libgcc-file-name`" diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog index 0c65ddae..24c854e8 100644 --- a/lib/et/ChangeLog +++ b/lib/et/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Theodore Ts'o + + * compile_et.sh.in: Remove XSI:isms for greater portability. + (Addresses Debian Bug #255589) + 2004-02-29 Brian Bergstrand * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use diff --git a/lib/et/compile_et.sh.in b/lib/et/compile_et.sh.in index 0e7634c7..e41b51b9 100644 --- a/lib/et/compile_et.sh.in +++ b/lib/et/compile_et.sh.in @@ -15,10 +15,10 @@ if test "x$1" = x ; then exit 1 fi -if test ! -f "$DIR/et_h.awk" -o ! -f "$DIR/et_c.awk" ; then +if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then DIR="$ET_DIR" # echo "Falling back to $DIR..." - if test ! -f "$DIR/et_h.awk" -o ! -f "$DIR/et_c.awk" ; then + if test ! -f "$DIR/et_h.awk" || test ! -f "$DIR/et_c.awk" ; then echo "compile_et: Couldn't find compile_et's template files." exit 1 fi diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog index 0d1357e0..426bee23 100644 --- a/lib/ss/ChangeLog +++ b/lib/ss/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Theodore Ts'o + + * mk_cmds.sh.in: Remove XSI:isms for greater portability. + (Addresses Debian Bug #255589) + 2004-02-29 Brian Bergstrand * Makefile.in: Use $(BSDLIB_PIC_FLAG) to determine whether to use diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in index c35d6b03..303a73a7 100644 --- a/lib/ss/mk_cmds.sh.in +++ b/lib/ss/mk_cmds.sh.in @@ -16,10 +16,10 @@ if test -n "$_SS_DIR_OVERRIDE" ; then DIR="$_SS_DIR_OVERRIDE"; fi -if test ! -f $DIR/ct_c.sed -o ! -f $DIR/ct_c.awk ; then +if test ! -f $DIR/ct_c.sed || test ! -f $DIR/ct_c.awk ; then DIR="$SS_DIR" # echo "Falling back to $DIR..." - if test ! -f "$DIR/ct_c.sed" -o ! -f "$DIR/ct_c.awk" ; then + if test ! -f "$DIR/ct_c.sed" || test ! -f "$DIR/ct_c.awk" ; then echo "mk_cmds: Couldn't find mk_cmds's template files." exit 1 fi diff --git a/tests/ChangeLog b/tests/ChangeLog index c9b77761..48188dd0 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2004-09-17 Theodore Ts'o + + * test_script.in: Remove XSI:isms for greater portability. + (Addresses Debian Bug #255589) + 2004-02-28 Theodore Ts'o * Release of E2fsprogs 1.35 diff --git a/tests/test_script.in b/tests/test_script.in index 87788824..51cb099d 100644 --- a/tests/test_script.in +++ b/tests/test_script.in @@ -4,7 +4,7 @@ # if test "$1"x = x ; then - TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | egrep -v "\.failed|\.new"` + TESTS=`ls -d $SRCDIR/[a-zA-Z]_* | grep -E -v "\.failed|\.new"` else TESTS= for i