Update Release Notes, Changelogs, version.h, etc. for 1.40 release

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
diff --git a/ChangeLog b/ChangeLog
index 7913efa..4767882 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-23  Theodore Tso  <tytso@mit.edu>
 
 	* COPYING: Clarify copyright licenses used by the various
diff --git a/README b/README
index 156e16a..1964ad2 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-	This is the new version (1.39) of the second extended file
+	This is the new version (1.40) 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 e247580..a14a5f7 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,5 +1,108 @@
-E2fsprogs 1.40-WIP (April 7, 2007)
-==================================
+E2fsprogs 1.40-WIP (June 23, 2007) (hg changeset 2161)
+===================================
+
+Add new blkid -g option which causes the blkid cache to be garbage
+collected.
+
+Fix a bug in libblkid which could cause the internal field bid_type to
+become corrupted.  Fortunately bid_type isn't used much, and bid_label
+and bid_uuid is only used by debugging code, so the impact of this bug
+was very minor.
+
+Mke2fs will now store the RAID stride value when a filesystem is
+created with a requested RAID stride, and then use it automatically in
+resize2fs.
+
+Mke2fs has a sanity check added to make sure (inode_size * num_inodes)
+isn't too big.  In some cases Lustre users have tried specifying an
+inode size of 4096 bytes, while keeping an inode ratio of one inode
+per 4096 bytes.  
+
+Improve sanity check in e2fsck's algorithm for finding a backup
+superblock, so that it won't accidentally find a superblock that was
+located in the journal, and then later reject it as being not a valid
+backup superblock.
+
+Fix e2fsck get_size logic so that it will work with the Linux floppy
+driver.  The Linux floppy driver is a bit different from the other
+block device drivers, in that if the device has been opened with
+O_EXCL, it disallows another open(), even if the second open() does
+not have the O_EXCL flag.  (Addresses Debian Bug: #410569)
+
+Fix error checking of badblock's last-block and start-block arguments.
+(Addresses Debian Bug: #416477)
+
+Fix e2fsck so that it doesn't overwrite the backup superblocks when
+recovering a journal until the master superblock has been confirmed as
+being sane.
+
+Change the blkid library to be much more paranoid about concluding
+that a partition contains an NTFS filesystem, and fetch the UUID and
+LABEL information from NTFS filesystems.  (Addresses Launchpad Bug:
+#110138)
+
+Factor out the code which sets the default journal size and move it
+into libext2fs.
+
+Enhance e2fsck so it will recreate the ext3 journal if the original
+journal inode was cleared to due it being corrupt after finishing the
+filesystem check.
+
+Fix e2fsck so that it updates the journal inode if it is corrupted and
+the backup journal information from the superblock was successfully
+used to recover the filesystem.
+
+Fix e2fsck so that it checks all of the blocks in the journal inode
+for validity.  The original code only checked the direct blocks to
+make sure the journal inode was sane.  Unfortunately, if some or all
+of the indirect or doubly indirect blocks were corrupted, this would
+not be caught.
+
+Add support in blkid to detect LUKS encrypted partitions.
+
+Add extra sanity checks for extended attributes in the case where the
+size is zero but the offset is very large.
+
+Fix byte-swapping issues for large inodes in ext2fs_read_inode_full()
+and ext2fs_get_next_inode_full().
+
+Clarify the copyright licenses used by the various libraries in
+the top-level COPYING  file (Red Hat Bugzilla: 166058)
+
+Make mke2fs's defaults when /etc/mke2fs.conf doesn't exist more sane.
+
+Fix mke2fs and debugfs to support large (> 16 bit) uid's and gid's.
+
+Remove check in e2fsck which requires EA's in inodes to be sorted;
+they don't need to be sorted, and e2fsck was previously wrongly
+clearing unsorted EA's stored in the inode structure.
+
+Allow mke2fs or tune2fs to create a substantially larger journal (up
+to 10,240,000 blocks).
+
+Fix MD superblock detection, and make sure the correct UUID is
+reported from the MD superblock.
+
+Fix a signed vs. unsigned bug in debugfs.
+
+Enhance debugfs's date parser so that it accepts integer values.
+
+Fix e2fsck's pass1c accounting so it doesn't terminate too early if a
+file with multiply claimed blocks is hard linked. or not at all if the
+root directory contains shared blocks
+
+Enhance debugfs so it can modify the block group descriptors using the
+command set_block_group_descriptor.
+
+Improve e2fsck's reporting of I/O errors so it's clearer what it was
+trying to do when an error happens
+
+Fix a bug in in how e2fsprogs byte swaps inodes containing fast
+symlinks that have extended attributes.  (Addresses Red Hat Bugzilla:
+#232663 and LTC Bugzilla: #27634)
+
+Fix potential file descriptor leak in ext2fs_get_device_size() in an
+error case.
 
 Add libreadline.so.5 support to libss.
 
@@ -124,11 +227,25 @@
 determining a partition's size, since binary searching to determine
 the device doesn't work on FreeBSD.
 
+Documentation about UUID's is available in enough places, and it's
+awkward to deal with debian-legal's insanities.  So I'm caving in the
+"more-lunatic-than-RMS" wing of Debian by removing RFC-4122 so we
+don't have do the dfsg tarball.  Also remove the rule that only tried
+to install RFC-4122 on Ubuntu, since Ubuntu seems to want to fetch
+e2fsprogs exclusively from Debian.  (Addresses Debian Bug: #407107)
+
+Fix the info-dir line so that the menu name does not contain a .info
+prefix.  First of all, it's ugly, secondly, it causes the install-info
+command to fail to remove the com_err info file from the
+/usr/share/info/dir file when the comerr-dev package is removed and
+purged.  (Addresses Debian Bug: #401711)
+
 Fixed spelling mistakes, typos, and otherwise clarified man pages.
 (Addresses Debian Bug: #369761, #373004, #379695)
 
 Fixed various Debian packaging issues --- see debian/changelog for
-details.  (Addresses Debian Bugs #389554, #390664, #413208)
+details.  (Addresses Debian Bugs #389554, #390664, #413208, #419605,
+#408352, #415560, #399155)
 
 
 Programmer's notes:
@@ -213,6 +330,35 @@
 Add support for using TDB to store the icount data, so we don't run out
 of memory when checking really large filesystems.
 
+Change the regression test suite so that it skips empty test directories.
+
+Define the l_i_iversion field in ext2_inode.  The l_i_version field is
+now defined from the old l_i_reserved1 field in the ext2 inode.  This
+field will be used to store high 32 bits of the 64-bit inode version
+number.
+
+Add Makefile production rule for e2fsprogs.spec in case it gets
+deleted.
+
+Add new function profile_get_uint() to allow for a clean way to fetch
+unsigned integers from the context.
+
+Add test to make sure the ext2 superblock structure is 1024 bytes.
+
+Fix typo in name of f_dup4 regression test
+
+Add new function blkid_gc_cache() which performs a garbage collection
+pass on the /etc/blkid.tab file.
+
+The ext2fs_open() function now sets EXT2_FLAG_MASTER_SB_ONLY.  In
+general, only e2fsck (after the filesystem is clean), tune2fs, and
+resize2fs should change the backup superblocks by default.  Most
+callers of ext2fs_open() should not be touching any superblock fields
+which require the backups to be touched.
+
+Add new function to libext2fs, ext2fs_default_journal_size(), which
+returns the default journal size.
+
 
 E2fsprogs 1.39 (May 29, 2006) 
 =============================
diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 31890b1..e4308ff 100644
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-11-12  Theodore Tso  <tytso@mit.edu>
 
 	* build-rpm: Ignore the quilt working directory, and clean up the
diff --git a/debian/changelog b/debian/changelog
index 900db79..cac3f52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,29 +1,95 @@
+e2fsprogs (1.40-1) unstable; urgency=low
+
+  * Add new blkid -g option which causes the blkid cache to be garbage
+      collected
+  * libblkid: Fix bug which could cuase bid_type to be corrupted
+  * mke2fs: Add santy check to make sure inode_size * num_inodes isn't too big
+  * Fix additional Coverity bugs in mke2fs and e2fsck
+  * Improve sanity check in e2fsck's algorithm for finding a backup superblock
+  * Fix e2fsck get_size logic so that it will work with the Linux floppy
+      driver (Closes: #410569)
+  * Fix error checking of badblock's last-block and start-block arguments
+      (Closes: #416477)
+  * e2fsck: avoid writing overwriting the backup superblocks until the
+      master superblock is confirmed to be sane
+  * Make the blkid library more paranoid about concluding a partition
+      contains a NTFS filesystem.  (Addresses Launchpad Bug: #110138)
+  * Enhance e2fsck so it will recreate the ext3 journal if the original
+      journal inode was cleared to due being corrupt
+  * Fix e2fsck so that if the backup journal information is used, that
+      this is written out to the journal inode
+  * Make e2fsck check all of the blocks in the journal inode for validity
+  * blkid: Add support for detecting LUKS encrypted partitions
+  * e2fsck: added sanity check for xattr validation
+  * Fix byte-swapping bug for filesystems with large inodes
+  * Clarify the copyright licenses used by the various libraries in COPYING
+  * Remove RFC-4122 from upstream (Closes: #407107)
+  * Fix info-dir line which prevented install-info from removing
+      com_err entry from from /usr/share/info/dir when the comerr-dev
+      package is purged (Closes: #401711)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 24 Jun 2007 17:22:58 -0400
+
+e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-2) unstable; urgency=low
+
+  * Allow the journal to up to 10,240,000 blocks
+  * Fix blkid library to recognize MD 0.90 superblock on little endian
+      systems
+  * Fix blkid library to report the correct UUID from MD superblocks
+  * Fix signed vs. unsigned problem in debugfs' setb/testb/freeb commands
+  * Enhance debugfs's date parser so it acccepts integer values
+  * Fix e2fsck's pass1c accounting so it doesn't terminate too early
+      if a file with multiply claimed blocks is hard linked. or not at
+      all if the root directory contains shared blocks
+  * Enhance debugfs so it can modify the block group descriptors using
+      the command set_block_group_descriptor
+  * Improve e2fsck's reporting of I/O errors so it's clearer what it
+      was trying to do when an error happens
+  * Fix a bug in how e2fsprogs byte swaps inodes containing fast
+      symlinks that have extended attributes.
+  * Fix potential file descriptor leak in ext2fs_get_device_size()
+  * Fix minor typo in e2fsck.conf.5 man page
+  * Cleanup udeb dependency (Closes: #419605)
+  * Rebuilding with libdevmapper 1.02.1 (Closes: #421022 and #421668)
+  * Add dependency on comerr-dev to ss-dev (Closes: #408352)
+  * Make mke2fs use sane defaults when /etc/mke2fs.conf doesn't exist
+  * Fix mke2fs and debugfs to support large (> 16 bit) uid's and gid's
+  * Fix spelling typo in debian package description for libblkid1
+    (Closes: #399155)
+  * Remove -WIP language from the debian copyright file.  (Closes: #415560)
+  * Remove check in e2fsck which required EA's in inodes to be sorted
+    (We should get this back-ported to the stable branch since 
+    filesystems with large inodes will have EA's erroneously
+    removed, which will for example toast an SELinux system.)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun,  6 May 2007 19:44:35 -0400
+
 e2fsprogs (1.39+1.40-WIP-2007.04.07+dfsg-1) unstable; urgency=low
 
   * Add libreadline.so.5 support to libss.
   * Impove badblocks -n/-w exclusive usage message.
   * Add debugging code (via the COMERR_DEBUG env. variable) to the
-	com_err library
+      com_err library
   * Fix dump_unused segfault in debugfs when a filesystem is not open
   * Add versioned dependency in Debian's shlibs for libblkid.  
-	(Closes: #413208)
+      (Closes: #413208)
   * Fix memory leak in blkid library.  (Closes: #413661)
   * Let the debugfs lcd command work even if a filesystem is not open
   * Fix large number of miscellaneous Coveriy bugs.  (None were
-	security-security).
+      security-security).
   * Fix e2fsck to clear i_size for special devices with a bogus i_blocks
-	field on the first pass.
+      field on the first pass.
   * Fix e2fsck to set the file type of the '..' entry when connecting
-	a directory to lost+found.
+      a directory to lost+found.
   * Enhance e2fsck to recover directories whose modes field were
-	corrupted to look like special files.
+      corrupted to look like special files.
   * Allow debugfs to dump > 2GB files.  (Closes: #412614)
   * Misc. man page cleanups.  (Closes: #379695)
   * Fix resize2fs parsing of size parameter (Closes: #408298)
   * Fix infinite loop in e2fsck on really big filesystems (Closes: #411838)
   * Fix memory leak in ext2fs_write_new_inode()
   * Add support for using a scratch files directory to reduce e2fsck's
-	memory utilization on really big filesystems.
+      memory utilization on really big filesystems.
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sat,  7 Apr 2007 10:38:40 -0400
 
@@ -50,7 +116,7 @@
   * Reorder the library line for static linking, to fix undefined
     references to pthreads on amd64.  (Closes: #393680)
   * Fix mke2fs's error checking when creating revision 0 filesystems.
-    (Closes #392107)
+    (Closes: #392107)
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 22 Oct 2006 00:19:44 -0400
 
@@ -694,7 +760,7 @@
   * Debugfs now searches for the appropriate pager to use, beginning
     with /usr/bin/pager, and then falling back to 'less' and 'more'.
     (Closes: #221977)
-  * Fixed mangled encoding in Czech locale file.  (Closes #214633)
+  * Fixed mangled encoding in Czech locale file.  (Closes: #214633)
   * Fix bug where using debugfs to copy a file from /dev/null caused
     in correct mode bits.  (Closes: #217456)
   * Fixed a bug where e2fsck would bomb out if a journal needed to be
@@ -903,8 +969,8 @@
   * Add new debugfs command, imap, which prints the location of a 
     specified inode in the inode table.
   * Put /usr/include/com_err.h in comerr-dev instead of e2fslibs-dev.  
-    (Closes #191899)
-  * Add support for OV-style continuations in compile_et.  (Closes #191900)
+    (Closes: #191899)
+  * Add support for OV-style continuations in compile_et.  (Closes: #191900)
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon,  5 May 2003 18:13:12 -0400
 
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog
index c3731db..8b5371f 100644
--- a/debugfs/ChangeLog
+++ b/debugfs/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-05-22  Theodore Tso  <tytso@mit.edu>
 
 	* util.c: #define _XOPEN_SOURCE so we get strptime() prototype
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 81fffa3..99fd08c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-03-18  Theodore Ts'o  <tytso@mit.edu>
 
 	* libext2fs.texinfo (Iterating over blocks in an inode): Fix
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index cce19ce..1277c3a 100644
--- 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.39)
+@settitle The EXT2FS Library (version 1.40)
 @synindex tp fn
 @comment %**end of header
 
@@ -61,8 +61,8 @@
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.39
-@subtitle May 2006
+@subtitle Version 1.40
+@subtitle June 2007
 
 @author by Theodore Ts'o
 
@@ -103,7 +103,7 @@
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.39.
+This manual documents the EXT2FS Library, version 1.40.
 
 @end ifinfo
 
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index 06fa905..bb03b0a 100644
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-22  Theodore Tso  <tytso@mit.edu>
 
 	* pass1.c (check_ext_attr): Adds an extra validity test in
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index cb5127d..10ed870 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,16 +1,16 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.39
-Entered-date:   29May2006
+Version:        1.40
+Entered-date:   24June2007
 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
-		3616kB e2fsprogs-1.39.tar.gz
-		480kB e2fsprogs-libs-1.39.tar.gz
-                1kB   e2fsprogs-1.39.lsm
+		4064kB e2fsprogs-1.40.tar.gz
+		476kB e2fsprogs-libs-1.40.tar.gz
+                1kB   e2fsprogs-1.40.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/2.5.x/2.6.x
 Copying-policy: GPL/LGPL
diff --git a/ext2ed/ChangeLog b/ext2ed/ChangeLog
index 2756490..d4fe35a 100644
--- a/ext2ed/ChangeLog
+++ b/ext2ed/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-08-30  Theodore Tso  <tytso@mit.edu>
 
 	* init.c (div_ceil, set_file_system_info): Fix potential overflow
diff --git a/ext2ed/doc/ChangeLog b/ext2ed/doc/ChangeLog
index 68d98f8..2141d25 100644
--- a/ext2ed/doc/ChangeLog
+++ b/ext2ed/doc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-06-30  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.38
diff --git a/include/nonunix/ChangeLog b/include/nonunix/ChangeLog
index fb5e9dd..0c18683 100644
--- a/include/nonunix/ChangeLog
+++ b/include/nonunix/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-06-30  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.38
diff --git a/install-utils/ChangeLog b/install-utils/ChangeLog
index f890c3a..e986bde 100644
--- a/install-utils/ChangeLog
+++ b/install-utils/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-06-30  Theodore Ts'o  <tytso@mit.edu>
 
 	* Release of E2fsprogs 1.38
diff --git a/intl/ChangeLog b/intl/ChangeLog
index 5db148a..e2fecf9 100644
--- a/intl/ChangeLog
+++ b/intl/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-10-22  Theodore Tso  <tytso@mit.edu>
 
 	* Makefile.in: Add datarootdir definition for compatibility with
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 9b906be..c849213 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-06-28  Andreas Dilger <adilger@clusterfs.com>
 
 	* e2fsck.h, ext2_ext_attr.h: Protect header files from multiple
diff --git a/lib/blkid/ChangeLog b/lib/blkid/ChangeLog
index a4b469b..567bf0f 100644
--- a/lib/blkid/ChangeLog
+++ b/lib/blkid/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-05-22  Karsten Hopp  <karsten@redhat.com>
 
 	* probe.c (probe_luks): Add support for cryptsetup-luks partitions
diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index dc5d04f..9f3ba25 100644
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-04-02  Theodore Tso  <tytso@mit.edu>
 
 	* parse_num.c (parse_num_blocks): When parsing the 's' prefix,
diff --git a/lib/et/ChangeLog b/lib/et/ChangeLog
index 4ab07c8..705f38c 100644
--- a/lib/et/ChangeLog
+++ b/lib/et/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-24  Theodore Tso  <tytso@mit.edu>
 
 	* com_err.texinfo: Fix the info-dir line so that the name does not
diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index 7be87c8..f7ef59d 100644
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-22  Theodore Tso  <tytso@mit.edu>
 
 	* inode.c (ext2fs_read_inode_full): Pass in bufsize so the full
diff --git a/lib/ss/ChangeLog b/lib/ss/ChangeLog
index ca8f941..7ca6e5a 100644
--- a/lib/ss/ChangeLog
+++ b/lib/ss/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-03-21  Theodore Tso  <tytso@mit.edu>
 
 	* execute_cmd.c (ss_execute_line): Fix a memory leak by freeing
diff --git a/lib/uuid/ChangeLog b/lib/uuid/ChangeLog
index d51b999..0007803 100644
--- a/lib/uuid/ChangeLog
+++ b/lib/uuid/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-10-22  Theodore Tso  <tytso@mit.edu>
 
 	* gen_uuid.c (get_random_bytes): Add in randomness based on
diff --git a/misc/ChangeLog b/misc/ChangeLog
index d1b4b79..c27acb1 100644
--- a/misc/ChangeLog
+++ b/misc/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-12  Theodore Tso  <tytso@mit.edu>
 
 	* tune2fs.c (main): Clear the EXT2_FLAG_MASTER_SB_ONLY flag
diff --git a/po/ChangeLog b/po/ChangeLog
index 75705eb..9a314e6 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2006-10-22  Theodore Tso  <tytso@mit.edu>
 
 	* Makefile.in.in: Add datarootdir definition for compatibility
diff --git a/resize/ChangeLog b/resize/ChangeLog
index 9c8a8c2..601fb1b 100644
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-12  Theodore Tso  <tytso@mit.edu>
 
 	* resize2fs.c (resize_fs): Clear the EXT2_FLAG_MASTER_SB_ONLY flag
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 0758864..1316fae 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-06-21  Theodore Tso  <tytso@mit.edu>
 
 	* f_badjour_indblks: New test case which checks if a corrupted
diff --git a/tests/progs/ChangeLog b/tests/progs/ChangeLog
index b42f122..613ad57 100644
--- a/tests/progs/ChangeLog
+++ b/tests/progs/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-04-06  Theodore Tso  <tytso@mit.edu>
 
 	* test_icount.c: Fix up usage and decrement error messages
diff --git a/util/ChangeLog b/util/ChangeLog
index e99d46c..5970f94 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-24  Theodore Ts'o  <tytso@mit.edu>
+
+	* Release of E2fsprogs 1.40
+
 2007-03-21  Theodore Tso  <tytso@mit.edu>
 
 	* subst.c (compare_file): Close old FILE handle if the new FILE
diff --git a/version.h b/version.h
index 7567657..1701177 100644
--- a/version.h
+++ b/version.h
@@ -7,5 +7,5 @@
  * the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.40-WIP"
-#define E2FSPROGS_DATE "7-Apr-2007"
+#define E2FSPROGS_VERSION "1.40"
+#define E2FSPROGS_DATE "24-Jun-2007"