setup: update the debian/copyright text to reflect the current licences

diff --git a/misc/feisty/debian/copyright b/misc/feisty/debian/copyright
index 98242b30910fc9a2e3fa466cee42c825b51a152c..9b7df836b6e4c2f55cd75a4a9923d94a695f264b 100644 (file)
--- a/misc/feisty/debian/copyright
+++ b/misc/feisty/debian/copyright
@@ -2,14 +2,18 @@ This package was debianized by Brian Warner <warner@allmydata.com>
 
 The upstream source of this project is http://allmydata.org .
 
-Copyright (c) 2006-2007
+Copyright (c) 2006-2009
 AllMyData, Inc.
 
-This package is licensed under the GPL (v2), with additional rights. For a
-description of the GPL v2, see /usr/share/common-licenses/GPL-2 on your
-Debian system.
+You may use this package under the GNU General Public License, version 2 or, at
+your option, any later version.
 
-It also comes with the added permission that, in the case that you are
-obligated to release a derived work under this licence (as per section 2.b of
-the GPLv2), you may delay the fulfillment of this obligation for up to 12
-months.
+You may use this package under the Transitive Grace Period Public Licence,
+version 1.0.  The Transitive Grace Period Public Licence has requirements
+similar to the GPL except that it allows you to wait for up to twelve months
+after you redistribute a derived work before releasing the source code of your
+derived work. See the file COPYING.TGPPL.html for the terms of the Transitive
+Grace Period Public Licence, version 1.0.
+
+(You may choose to use this package under the terms of either licence, at your
+option.)

diff --git a/misc/sid/debian/copyright b/misc/sid/debian/copyright
index 98242b30910fc9a2e3fa466cee42c825b51a152c..9b7df836b6e4c2f55cd75a4a9923d94a695f264b 100644 (file)
--- a/misc/sid/debian/copyright
+++ b/misc/sid/debian/copyright
@@ -2,14 +2,18 @@ This package was debianized by Brian Warner <warner@allmydata.com>
 
 The upstream source of this project is http://allmydata.org .
 
-Copyright (c) 2006-2007
+Copyright (c) 2006-2009
 AllMyData, Inc.
 
-This package is licensed under the GPL (v2), with additional rights. For a
-description of the GPL v2, see /usr/share/common-licenses/GPL-2 on your
-Debian system.
+You may use this package under the GNU General Public License, version 2 or, at
+your option, any later version.
 
-It also comes with the added permission that, in the case that you are
-obligated to release a derived work under this licence (as per section 2.b of
-the GPLv2), you may delay the fulfillment of this obligation for up to 12
-months.
+You may use this package under the Transitive Grace Period Public Licence,
+version 1.0.  The Transitive Grace Period Public Licence has requirements
+similar to the GPL except that it allows you to wait for up to twelve months
+after you redistribute a derived work before releasing the source code of your
+derived work. See the file COPYING.TGPPL.html for the terms of the Transitive
+Grace Period Public Licence, version 1.0.
+
+(You may choose to use this package under the terms of either licence, at your
+option.)