ChangeLog, mk_cmds.sh.in:

  mk_cmds.sh.in: Fix error message so that it says mk_cmds's template
  	files instead of compile_et's template files.
ChangeLog, resize2fs.h:
  resize2fs.h: Protect include of unistd.h with HAVE_UNISTD_H.
e2fsprogs.lsm:
  Updated for 1.12 release.

diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index 848227f..f43183f 100644 (file)
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title:          EXT2 Filesystem utilities
 Version:        1.12
-Entered-date:   4Jul97
+Entered-date:   9Jul97
 Description:    The filesystem utilities for the EXT2 filesystem, including 
                e2fsck, mke2fs, dumpe2fs, fsck, and others.
 Keywords:       utilities, fsck, filesystem, Ext2fs
@@ -11,7 +11,7 @@ Primary-site:   tsx-11.mit.edu /pub/linux/packages/ext2fs
                686kB e2fsprogs-1.12.tar.gz
                237kB e2fsprogs-1.12-elfbin.tar.gz
                166kB e2fsprogs-1.12-dllbin.tar.gz
-               237kB e2fsprogs-1.12-0.i386.rpm
+               236kB e2fsprogs-1.12-0.i386.rpm
                82kB  e2fsprogs-devel-1.12-0.i386.rpm
                688kB e2fsprogs-1.12-0.src.rpm
                 1kB   e2fsprogs-1.12.lsm

diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index 8087b1d..6f8bcf1 100644 (file)
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,8 @@
+1998-07-10  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * mk_cmds.sh.in: Fix error message so that it says mk_cmds's
+               template files instead of compile_et's template files.
+
 1998-07-09  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.12

diff --git a/lib/ss/mk_cmds.sh.in b/lib/ss/mk_cmds.sh.in
index 1623309..9ffaa9d 100644 (file)
--- a/lib/ss/mk_cmds.sh.in
+++ b/lib/ss/mk_cmds.sh.in
@@ -16,7 +16,7 @@ if test ! -f $DIR/ct_c.sed -o ! -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
-       echo "compile_et: Couldn't find compile_et's template files."
+       echo "mk_cmds: Couldn't find mk_cmds's template files."
        exit 1
     fi
 fi

diff --git a/resize/ChangeLog b/resize/ChangeLog
index 7e13259..3bb3e15 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+1998-07-26  Theodore Ts'o  <tytso@rsts-11.mit.edu>
+
+       * resize2fs.h: Protect include of unistd.h with HAVE_UNISTD_H.
+
 1998-07-09  Theodore Ts'o  <tytso@rsts-11.mit.edu>
 
        * Release of E2fsprogs 1.12

diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index cc89f4f..e9919cf 100644 (file)
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -10,7 +10,9 @@
 
 #include <stdio.h>
 #include <string.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include <stdlib.h>
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>