Clarify the copyright licenses used by the various libraries in COPYING

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/COPYING b/COPYING
index b37f78d..dd1227b 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,33 +1,25 @@
 This package, the EXT2 filesystem utilities, are made available under
-the GNU Public License version 2, with the exception of the lib/uuid
-directory which is made available under a BSD-style license and the
-lib/et and lib/ss libraries which are made available under an
-MIT-style license.  Please see lib/uuid/COPYING for more details for
-the license for the files comprising the libuuid library, and the
-source file headers of the libet and libss libraries for more
-information.
-
-However, I request that if the version string in the file version.h
-contains the string "pre-", or "WIP" that this version of e2fsprogs be
-distributed in source form only.  Please feel free to give a copy of
-the e2fsck binary to help a friend recover his or her filesystem, as
-the need arises.  However, "pre" or "WIP" indicates that this release
-is under development, and available for ALPHA testing.  So for your
-protection as much as mine, I'd prefer that it not appear in a some
-distribution --- especially not a CD-ROM distribution!
+the GNU Public License version 2, with the exception of the lib/ext2fs
+and lib/e2p libraries, which are made available under the GNU Library
+General Public License Version 2, the lib/uuid library which is made
+available under a BSD-style license and the lib/et and lib/ss
+libraries which are made available under an MIT-style license.  Please
+see lib/uuid/COPYING for more details for the license for the files
+comprising the libuuid library, and the source file headers of the
+libet and libss libraries for more information.
 
 The most recent officially distributed version can be found at
 http://e2fsprogs.sourceforge.net.  If you need to make a distribution,
 that's the one you should use.  If there is some reason why you'd like
-a more recent version that is still in ALPHA testing for your
-distribution, please contact me (tytso@mit.edu), and we will very
-likely be able to work out something that will work for all concerned.
-The release schedules for this package are flexible, if you give me
-enough lead time.
+a more recent version that is still in ALPHA testing (i.e., either
+using the "WIP" test distributions or one from the hg or git
+repository from the development branch, please contact me
+(tytso@mit.edu) before you ship.  The release schedules for this
+package are flexible, if you give me enough lead time.
 
 
                                        Theodore Ts'o
-                                       15-Mar-2003
+                                       23-June-2007
 
 ----------------------------------------------------------------------
 

diff --git a/ChangeLog b/ChangeLog
index d545549..7913efa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-23  Theodore Tso  <tytso@mit.edu>
+
+       * COPYING: Clarify copyright licenses used by the various
+               libraries in e2fsprogs.
+
 2007-05-22  Theodore Tso  <tytso@mit.edu>
 
        * Makefile.in (rpm): Add production rule for e2fsprogs.spec, in