Update and clarify copyright statement.

diff --git a/COPYING b/COPYING
index ce17efd..50cf486 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -1,27 +1,27 @@
-This package, the EXT2 filesystem utilities, are protected by the GNU
-Public License, with the following exception --- 
-
-       If the version string in the file version.h contains the
-       string "pre-", or "WIP" then this package must be distributed
-       in source form only.  You can give a copy of the binary for
-       e2fsck 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 rather not have it
-       appear in a some distribution --- especially not a CD-ROM
-       distribution!
+This package, the EXT2 filesystem utilities, are made available under
+the GNU Public License.
+
+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 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 can see if we
-can't come to an arrangement.  The release schedules for this package
-are flexible, if you give me enough lead time.
+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.
 
 
                                        Theodore Ts'o
-                                       26-Jul-2000
+                                       15-Mar-2003
 
 ----------------------------------------------------------------------
 

diff --git a/debian/e2fsprogs.copyright b/debian/e2fsprogs.copyright
index 17998e2..047c40b 100644 (file)
--- a/debian/e2fsprogs.copyright
+++ b/debian/e2fsprogs.copyright
@@ -4,36 +4,39 @@ written by Theodore Ts'o <tytso@mit.edu> and Remy Card <card@masi.ibp.fr>.
 
 Sources were obtained from http://sourceforge.net/projects/e2fsprogs
 
-Packaging is copyright (c) 1997-2001 Yann Dirson <dirson@debian.org>
+Packaging is copyright (c) 1997-2003 Yann Dirson <dirson@debian.org>
+             copyright (c) 2003 Theodore Ts'o <tytso@mit.edu>          
             copyright (c) 2001 Alcove <http://www.alcove.com/>
             copyright (c) 1997 Klee Dienes
             copyright (c) 1995-1996 Michael Nonweiler <mrn20@cam.ac.uk>
 
+Upstream Author: Theodore Ts'o <tytso@mit.edu>
+
 Copyright notice:
 
 This package, the EXT2 filesystem utilities, are protected by the GNU
-Public License, with the following exception --- 
-
-       If the version string in the file version.h contains the
-       string "pre-", then this package must be distributed in source
-       form only.  You can give a copy of the binary for e2fsck to
-       help a friend recover his or her filesystem, as the need
-       arises.  However, "pre" indicates that this release is under
-       development, and available for ALPHA testing.  So for your
-       protection as much as mine, I'd rather not have it appear in a
-       some distribution --- especially not a CD-ROM distribution!
-
-The most recent officially distributed version can be found on
-tsx-11.mit.edu, in /pub/linux/packages/ext2fs.  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 can
-see if we can't come to an arrangement.  The release schedules for
-this package are flexible, if you give me enough lead time.
-
+Public License.
+
+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 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.
 
                                        Theodore Ts'o
-                                       26-Mar-97
+                                       15-Mar-2003
 
 On Debian GNU systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.