From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Wed, 11 Mar 2009 15:29:52 +0000 (-0700)
Subject: setup: update the debian/copyright text to reflect the current licences
X-Git-Tag: allmydata-tahoe-1.4.0~68
X-Git-Url: https://git.rkrishnan.org/pf/content/$sch_link?a=commitdiff_plain;h=cc9adba8a377d66c8cada94954ecd5168b3542d0;p=tahoe-lafs%2Ftahoe-lafs.git

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

diff --git a/misc/feisty/debian/copyright b/misc/feisty/debian/copyright
index 98242b30..9b7df836 100644
--- 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 98242b30..9b7df836 100644
--- 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.)