Many files:

  Interim checkin for 1.21-WIP release.

diff --git a/README b/README
index aeb1304..7633d2a 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-       This is the new version (1.20) of the second extended file
+       This is the new version (1.21) of the second extended file
 system management programs.
 
        From time to time, I release new versions of e2fsprogs, to fix

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6c19a24..fc09b24 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,34 @@
+E2fsprogs 1.21-WIP (June 1, 2001)
+=================================
+
+Fixed two bugs in e2fsck's handling of dup block handling, dealing
+with relatively uncommon edge cases: a directory with an indirect
+block which is claimed by another file, and when the last inode in the
+filesystem has blocks claimed by another file.
+
+Fix e2fsck's handling of incompatible journal flags so that the user
+has chance to abort, and then has the option to clear out the journal
+entirely.
+
+Programmer's notes:
+-------------------
+
+Fix general gcc -Wall complaints.
+
+The types needed by the ext2 header files are now provided by
+lib/ext2fs/ext2_types.h, instead of include/asm/types.h.
+
+Fixed make depend script so that it automatically corrects the
+pathname cleanups performed by make -M, so I don't have to fix them up
+by hand.
+
+Fixed the d_loaddump test case to be more robust, and not depend on
+bash'isms.
+
+Removed debugfs's dependence on pread(), which was accidentally
+intrudced in e2fsprogs 1.20
+
+
 E2fsprogs 1.20 (May 20, 2001)
 =============================
 

diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 5d8c97e..e9271a7 100644 (file)
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -1,7 +1,7 @@
 \input texinfo    @c -*-texinfo-*-
 @c %**start of header
 @setfilename libext2fs.info
-@settitle The EXT2FS Library (version 1.20)
+@settitle The EXT2FS Library (version 1.21)
 @synindex tp fn
 @comment %**end of header
 
@@ -61,8 +61,8 @@ by the author.
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.20
-@subtitle May 2001
+@subtitle Version 1.21
+@subtitle June 2001
 
 @author by Theodore Ts'o
 
@@ -77,7 +77,7 @@ by the author.
 
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1997, 1998 Theodore Ts'o
+Copyright @copyright{} 1997, 1998, 1999, 2000, 2001 Theodore Ts'o
 
 @sp 2
 
@@ -102,7 +102,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.20.
+This manual documents the EXT2FS Library, version 1.21.
 
 @end ifinfo
 

diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index ef0e7ab..0a7b258 100644 (file)
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.20
-Entered-date:   25May2001
+Version:        1.21
+Entered-date:   01Jun2001
 Description:    The filesystem utilities for the EXT2 filesystem, including 
                e2fsck, mke2fs, dumpe2fs, fsck, and others.
 Keywords:       utilities, fsck, filesystem, Ext2fs
 Author:         tytso@mit.edu (Theodore Tso)
 Maintained-by:  tytso@mit.edu (Theodore Tso)
 Primary-site:   download.sourceforge.net /pub/sourceforge/e2fsprogs
-               1136kB e2fsprogs-1.20.tar.gz
-                1kB   e2fsprogs-1.20.lsm
+               1136kB e2fsprogs-1.21.tar.gz
+                1kB   e2fsprogs-1.21.lsm
 Alternate-site: 
 Platforms:     linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x
 Copying-policy: GPL/LGPL

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index ca63806..c195b55 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -1,6 +1,6 @@
 Summary: Utilities for managing the second extended (ext2) filesystem.
 Name: e2fsprogs
-Version: 1.20
+Version: 1.21
 Release: 0
 Copyright: GPL
 Group: System Environment/Base

diff --git a/version.h b/version.h
index 213544e..5a5c39f 100644 (file)
--- a/version.h
+++ b/version.h
@@ -6,5 +6,5 @@
  * Ts'o.  This file may be redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.20"
-#define E2FSPROGS_DATE "25-May-2001"
+#define E2FSPROGS_VERSION "1.21-WIP"
+#define E2FSPROGS_DATE "01-Jun-2001"