X Strike Force X.Org X11 SVN commit: r214 - trunk/debian
Author: branden
Date: 2005-06-14 17:08:20 -0500 (Tue, 14 Jun 2005)
New Revision: 214
Modified:
trunk/debian/changelog
trunk/debian/copyright
Log:
Document DFSG-non-freeness of PolyglotMan ("rman") in debian/copyright.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-06-14 21:53:14 UTC (rev 213)
+++ trunk/debian/changelog 2005-06-14 22:08:20 UTC (rev 214)
@@ -169,8 +169,10 @@
(Alex Deucher)
<URL: https://bugs.freedesktop.org/show_bug.cgi?id=2089 >.
- -- Branden Robinson <branden@debian.org> Tue, 14 Jun 2005 14:52:14 -0500
+ * Document DFSG-non-freeness of PolyglotMan ("rman") in debian/copyright.
+ -- Branden Robinson <branden@debian.org> Tue, 14 Jun 2005 17:06:33 -0500
+
xfree86 (4.3.0.dfsg.1-14) unstable; urgency=high
Urgency set to high due to fix for security flaw (see below).
Modified: trunk/debian/copyright
===================================================================
--- trunk/debian/copyright 2005-06-14 21:53:14 UTC (rev 213)
+++ trunk/debian/copyright 2005-06-14 22:08:20 UTC (rev 214)
@@ -187,6 +187,53 @@
These files therefore do not satisfy DFSG 2 ("Source Code").
+ 8) PolyglotMan ("rman") has a license which generally withholds rights from
+ certain classes of users, and requires execution of an additional license
+ to obtain those rights:
+
+ Permission to use, copy, modify, and distribute this software and its
+ documentation for educational, research, internal corporate and
+ non-profit purposes, without fee, and without a written agreement is
+ hereby granted for all cases that do not conflict with the restriction
+ in the first sentence of this paragraph, provided that the above
+ copyright notice, this paragraph, and the following three paragraphs
+ appear in all copies.
+
+ Permission to incorporate this software into commercial products may be
+ obtained from the Office of Technology Licensing, 2150 Shattuck Avenue,
+ Suite 510, Berkeley, CA 94704.
+
+ These following files therefore fail to satisfy DFSG 6 ("No Discrimination
+ Against Fields of Endeavor") and DFSG 7 ("Distribution of License").
+
+ xc/extras/rman/ANNOUNCE-rman
+ xc/extras/rman/CHANGES
+ xc/extras/rman/MANIFEST
+ xc/extras/rman/Makefile
+ xc/extras/rman/Makefile.mac
+ xc/extras/rman/README-rman
+ xc/extras/rman/contrib/README-contrib
+ xc/extras/rman/contrib/authried.txt
+ xc/extras/rman/contrib/bennett.txt
+ xc/extras/rman/contrib/gzip.patch
+ xc/extras/rman/contrib/hman.cgi
+ xc/extras/rman/contrib/hman.ksh
+ xc/extras/rman/contrib/hman.pl
+ xc/extras/rman/contrib/http-rman.c
+ xc/extras/rman/contrib/http-rman.html
+ xc/extras/rman/contrib/lewis.pl
+ xc/extras/rman/contrib/man2html
+ xc/extras/rman/contrib/rman_html_split
+ xc/extras/rman/contrib/rman_html_split.1
+ xc/extras/rman/contrib/sco-wrapper.sh
+ xc/extras/rman/contrib/sutter.txt
+ xc/extras/rman/contrib/youki.pl
+ xc/extras/rman/getopt.c
+ xc/extras/rman/macish.c
+ xc/extras/rman/rman.1
+ xc/extras/rman/rman.c
+ xc/extras/rman/rman.html
+
See the debian/patches directory in the source package for all other
changes to upstream source.
Reply to: