X Strike Force X.Org X11 SVN commit: r131 - trunk/debian
Author: branden
Date: 2005-05-19 23:38:47 -0500 (Thu, 19 May 2005)
New Revision: 131
Modified:
trunk/debian/changelog
trunk/debian/copyright
Log:
Restore removal of credits to Stephen Early, Mark Eichin, and ISHIKAWA
Mutsumi as package authors. Alter Debian "fallback" copyright notice to
credit copyright from changes in 1996 to Stephen Early, in 1997 to Mark
Eichin, and for the years since to Branden Robinson. In the U.S., a
written instrument is required to transfer copyright, and to the best of
my knowledge, none of Stephen, Mark, or myself ever signed such an
instrument. Remove anti-publicity clause from Debian fallback copyright
notice as it's not part of the original MIT/X11 from the 1980s and has no
force under U.S. copyright law (asserting copyright in something, even
Free Software, doesn't waive a person's publicity rights anyway). Remove
duplicate Debian copyright notice for Software in the Public Interest,
Inc.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-20 04:27:38 UTC (rev 130)
+++ trunk/debian/changelog 2005-05-20 04:38:47 UTC (rev 131)
@@ -115,6 +115,18 @@
* Update debian/copyright to correctly document source package name, origin
of .orig.tar.gz file, and credit David Nusinow as a package author.
+ Restore removal of credits to Stephen Early, Mark Eichin, and ISHIKAWA
+ Mutsumi as package authors. Alter Debian "fallback" copyright notice to
+ credit copyright from changes in 1996 to Stephen Early, in 1997 to Mark
+ Eichin, and for the years since to Branden Robinson. In the U.S., a
+ written instrument is required to transfer copyright, and to the best of
+ my knowledge, none of Stephen, Mark, or myself ever signed such an
+ instrument. Remove anti-publicity clause from Debian fallback copyright
+ notice as it's not part of the original MIT/X11 from the 1980s and has no
+ force under U.S. copyright law (asserting copyright in something, even
+ Free Software, doesn't waive a person's publicity rights anyway). Remove
+ duplicate Debian copyright notice for Software in the Public Interest,
+ Inc.
-- Branden Robinson <branden@debian.org> Thu, 10 Mar 2005 14:53:09 -0500
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2005-05-20 04:27:38 UTC (rev 130)
+++ trunk/debian/copyright 2005-05-20 04:38:47 UTC (rev 131)
@@ -13,8 +13,8 @@
value, such as ":pserver:anoncvs@cvs.freedesktop.org:/cvs/xorg" for
anonymous access.)
-Debian package author(s): Branden Robinson, Fabio M. Di Nitto, Daniel Stone,
- David Nusinow
+Debian package author(s): Stephen Early, Mark Eichin, Branden Robinson, ISHIKAWA
+ Mutsumi, Fabio M. Di Nitto, Daniel Stone, David Nusinow
Debian modifications to upstream sources:
@@ -293,10 +293,12 @@
Debian copyright(s)/license(s):
-Unless otherwise noted, all modifications and additions to XOrg found in
+Unless otherwise noted, all modifications and additions to X.Org X11 found in
this Debian package bear the following copyright and license terms:
-Copyright 2004 Software in the Public Interest, Inc.
+Copyright 1996 Stephen Early
+Copyright 1997 Mark Eichin
+Copyright 1998-2005 Branden Robinson
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -311,48 +313,11 @@
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+THE COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Software in the Public
-Interest, Inc. shall not be used in advertising or otherwise to promote the
-sale, use or other dealingsin this Software without prior written
-authorization from Canonical Ltd.
-
--------------------------------------------------------------------------------
-
-Debian copyright(s)/license(s):
-
-Unless otherwise noted, all modifications and additions to XOrg found in
-this Debian package bear the following copyright and license terms:
-
-Copyright 1996-2002 Software in the Public Interest, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-SOFTWARE IN THE PUBLIC INTEREST, INC. BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Software in the Public
-Interest, Inc. shall not be used in advertising or otherwise to promote the
-sale, use or other dealings in this Software without prior written
-authorization from Software in the Public Interest, Inc.
-
Upstream copyright(s)/license(s):
********************************************************************************
Reply to: