r27 - in /web: ./ deps/dep5.mdwn

vorlon at users.alioth.debian.org vorlon at users.alioth.debian.org
Thu Mar 19 20:31:22 UTC 2009 

Author: vorlon
Date: Thu Mar 19 20:31:22 2009
New Revision: 27

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=27
Log:
finish proofreading; trying *oh so hard* not to intermingle substantive changes...

Modified:
    web/   (props changed)
    web/deps/dep5.mdwn

Propchange: web/
------------------------------------------------------------------------------
--- bzr:revision-id:v4 (original)
+++ bzr:revision-id:v4 Thu Mar 19 20:31:22 2009
@@ -4,3 +4,4 @@
 17 vorlon at debian.org-20090319071405-8j3mqxmv8hjywcqh
 18 vorlon at debian.org-20090319074758-rdfjw6qngcltzv8n
 21 vorlon at debian.org-20090319183222-ictvflsq2pstu25w
+22 vorlon at debian.org-20090319203102-izcx41baedb3ia0t

Propchange: web/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Thu Mar 19 20:31:22 2009
@@ -1,4 +1,4 @@
-timestamp: 2009-03-19 11:32:22.842999935 -0700
+timestamp: 2009-03-19 13:31:02.203000069 -0700
 committer: Steve Langasek <vorlon at debian.org>
 properties: 
 	branch-nick: web

Propchange: web/
------------------------------------------------------------------------------
--- bzr:text-parents (original)
+++ bzr:text-parents Thu Mar 19 20:31:22 2009
@@ -1,1 +1,0 @@
-deps/dep5.mdwn	vorlon at debian.org-20090319074758-rdfjw6qngcltzv8n

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=27&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Mar 19 20:31:22 2009
@@ -295,10 +295,10 @@
 The "`License`" field, to be machine-parseable, should not contain
 arbitrary values. There needs to be a list of accepted keywords which
 have a very specific, unambiguous meaning. The convention for license
-abbreviations keyword is `XYZ` for a license with only one version, and
-`XYZ-n` for sequential version *n* of the XYZ license, where
-`XYZ-1` is chronologically earlier than `XYZ-2`. The syntax of
-the `License` keyword can be defined using similar to [EBNF
+keywords is `XYZ` for a license with only one version, and `XYZ-n` for
+sequential version *n* of the XYZ license, where `XYZ-1` is
+chronologically earlier than `XYZ-2`. The syntax of the `License`
+keyword can be defined using the following [EBNF
 grammar](http://en.wikipedia.org/wiki/Extended_Backus–Naur_form):
 
 		License ::= <keyword>[<version>]["BY" {N* <clarification>}]
@@ -357,10 +357,10 @@
 TODO: If author did not specify version and version cannot be decoded
 from the context or other files, how the license should be expressed?
 
-Consult FSF's page for
+Consult the FSF's page for
 [GPL
 compatibility](http://www.fsf.org/licensing/licenses/#GPLCompatibleLicenses)
-of particular license.
+of particular licenses.
 
 There is no difference between regular versions and point-zero versions.
 E.g. keyword `CC-3` is identical to `CC-3.0` notation. The
@@ -372,8 +372,7 @@
 any later version".
 
 The GPL "`-Font`" clarification refers to the text added to the
-license notice of each file as expressed at FSF's page
-[How does the GPL apply to
+license notice of each file as specified at [How does the GPL apply to
 fonts?](http://www.gnu.org/licenses/gpl-faq.html#FontException).  The
 text needed is:
 
@@ -390,18 +389,17 @@
 > statement from your version.
 
 The GPL "`-OpenSSL`" clarification gives permission in cases where GPL
-code is linked with OpenSSL library. For more information, see page
-["The OpenSSL License and The 
+code is linked with OpenSSL library. For more information, see ["The
+OpenSSL License and The
 GPL"](http://www.gnome.org/~markmc/openssl-and-the-gpl.html) by Mark
-McLoughlin and message 
-["middleman software license conflicts with
+McLoughlin and the message ["middleman software license conflicts with
 OpenSSL"](http://lists.debian.org/debian-legal/2004/05/msg00595.html)
-by Mark McLoughlin in Debian legal mailing list. Any GPL source that
-uses OpenSSL and does not contain an openSSL exception notice is
+by Mark McLoughlin on the `debian-legal` mailing list. Any GPL source
+that uses OpenSSL and does not contain an OpenSSL exception notice is
 [REJECTED](http://ftp-master.debian.org/REJECT-FAQ.html) by the Debian
-FTP administrators. The license notice needs to include following or
-close to similar excerpt to qualify for `BY-OpenSSL` which allows
-linking with OpenSSL:
+FTP administrators. The license notice needs to include an exception
+such as the following to qualify for `BY-OpenSSL` which allows linking
+with OpenSSL:
 
 > ...
 
@@ -433,7 +431,7 @@
 2008-10-16
 
 [[!table data="""
-**keyword** | **GPL compatible** | **meaning**
+keyword | GPL compatible | meaning
 `BSD-C2` | Yes | Two-clause BSD license
 `BSD-C3` | Yes | Three-clause BSD license, with no-endorsement clause, as seen in `/usr/share/common-licenses/BSD`
 `BSD-C4` |<bgcolor="#ffcccc"> No | Four-clause BSD license, with no-endorsement clause and advertising clause; GPL-incompatible (need exact text)
@@ -450,6 +448,7 @@
 number of clauses in them. -- BenFinney 2008-10-15
 
 [[!table data="""
+ |
 `BSD-BY-LC` | forms requiring only the inclusion of copyright notice and condition
 `BSD-BY-LC-NE` | plus “no endorsement without permission”
 `BSD-BY-LC-NE-AD` | plus “advertising required”
@@ -465,11 +464,11 @@
 —JariAalto
 
 [[!table data="""
-`keyword` | `GPL compatible` | `meaning`
+keyword | GPL compatible | meaning
 [BSD](http://www.gnu.org/philosophy/license-list.html#OriginalBSD) |<bgcolor="#ffcccc"> No | Also known as the “[Original 4-clause BSD license](http://www.opensource.org/licenses/bsd-license.php)”. Contains the “obnoxious BSD advertising clause”.
 [ModifiedBSD](http://www.gnu.org/philosophy/license-list.html#ModifiedBSD) | Yes | This is the original BSD license, modified by removal of the advertising clause. It is a simple, permissive non-copyleft free software license.
 [FreeBSD](http://www.gnu.org/philosophy/license-list.html#FreeBSD) | Yes | Also known as the “[2-clause BSD license](http://www.freebsd.org/copyright/freebsd-license.html)”. Original BSD license with the advertising clause and another clause removed. This is safe, simple, permissive non-copyleft free software license.
-[OpenBSD](http://www.gnu.org/philosophy/license-list.html#ISC) | Yes | Also known by name "[ISC License](http://www.opensource.org/licenses/isc-license.txt)". This license does have an unfortunate wording choice.
+[OpenBSD](http://www.gnu.org/philosophy/license-list.html#ISC) | Yes | Also known as the "[ISC License](http://www.opensource.org/licenses/isc-license.txt)". This license does have an unfortunate wording choice.
 [ClearBSD](http://www.gnu.org/philosophy/license-list.html#clearbsd) | Yes | Based on the modified BSD license, and adds a term expressly stating it does not grant you any patent licenses.
 """]]
 
@@ -480,65 +479,62 @@
 Name](http://www.opensource.org/licenses/alphabetical),
 [Wikipedia: List of FSF approved software
 licences](http://en.wikipedia.org/wiki/List_of_FSF_approved_software_licences),
-[FSF: Various Licenses and Comments about 
-Them](http://www.gnu.org/philosophy/license-list.html) and [Open Source
-Initiative: Licenses by
-Name](http://www.opensource.org/licenses/alphabetical).
+and [FSF: Various Licenses and Comments about
+Them](http://www.gnu.org/philosophy/license-list.html).
 
 This list does not yet represent all widely used licenses. Good
-candicates are those listed in FSF or OSI pages mentioned above.  The
+candidates are those listed in the FSF or OSI pages mentioned above. The
 column "Version needed" means that the license keyword should always be
-accompanied with version number. E.g. plain keyword `Artistic` is to
-be avoided in favor of more explicit `Artistic-2` keyword.
-
-The *GPL compatible* field indicates compatibility in respect to
-license's version. E.g in case of Apache, the "2.0+ (v3)" means that
-Apache license version 2.0 was the first GPL v3 compatible license. The
-Apache licenses are not GPL v2 compatible. In case of CPL, the "No
-(1.0)" means that license version 1.0 is GPL incompatible; no
-information about other versions is known. If the field is linked to
-somewhere else, it means that the opinion has not been verified by FSF,
-but external source is being cited.
+accompanied by a version number. E.g., plain keyword `Artistic` is to
+be avoided in favor of the more explicit `Artistic-2` keyword.
+
+The *GPL compatible* field indicates compatibility by license version.
+E.g., in the case of Apache, the "2.0+ (v3)" means that Apache license
+version 2.0 was the first GPL v3 compatible license. The Apache licenses
+are not GPL v2 compatible. In the case of the CPL, the "No 1.0" means
+that license version 1.0 is GPL incompatible; no information about other
+versions is known. If the field is linked to somewhere else, it means
+that the opinion has not been verified by the FSF, but an external
+source is being cited.
 
 [[!table data="""
 **keyword** | **Version needed?** | **GPL compatible** | **meaning**
-`Apache` | Yes | 2.0+ (v3) | Apache license. For versions, consult [Apache Software Foundation](http://www.apache.org/licenses/).
-`Artistic` | Yes | 2.0+ (v2+) | The Perl Artistic license. For versions, consult [Perl Foundation](http://www.perlfoundation.org/perl5/index.cgi?action=revision_list;page_name=artistic_license)
+`Apache` | Yes | 2.0+ (v3) | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/).
+`Artistic` | Yes | 2.0+ (v2+) | The Perl Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/perl5/index.cgi?action=revision_list;page_name=artistic_license)
 `CDDL` | Yes |<bgcolor="#ffcccc"> No | Common Development and Distribution License, For verions, consult [Sun Microsystems](http://www.sun.com/cddl/). Based on MPL 1.1.
-`Eiffel` | Yes | [2+](http://www.eiffel-nice.org/license/) | The Eiffel Forum License. For versions, consult [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
-`CPL` | Yes |<bgcolor="#ffcccc"> No 1.0 | For versions, consult [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html). See also [Wikipedia](http://en.wikipedia.org/wiki/Common_Public_License)
+`Eiffel` | Yes | [2+](http://www.eiffel-nice.org/license/) | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
+`CPL` | Yes |<bgcolor="#ffcccc"> No 1.0 | For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html). See also [Wikipedia](http://en.wikipedia.org/wiki/Common_Public_License)
 `ISC` |<bgcolor="#ffebbb"> No | Yes | The Internet Software Consortium's [“ISC license”](http://opensource.org/licenses/isc-license.txt). Sometimes also known as the OpenBSD License
 `MPL` | Yes |<bgcolor="#ffcccc"> No | Mozilla Public License. For versions, consult [Mozilla.org](http://www.mozilla.org/MPL)
-`PSF` | Yes |<bgcolor="#ffcccc"> No 1.6b1-2.1 | For versions, consult [Python Software Foundation License](http://www.python.org/psf/license/)
-`W3C-Software` | Yes (YYYMMDD) | Yes | The W3C Software License. For more information, consult [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620S) and [20021231 W3C Software notice and license](http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231)
-`ZLIB` |<bgcolor="#ffebbb"> No | Yes | [The zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php)
+`PSF` | Yes |<bgcolor="#ffcccc"> No 1.6b1-2.1 | For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/)
+`W3C-Software` | Yes (YYYYMMDD) | Yes | The W3C Software License. For more information, consult the [W3C Intellectual Rights FAQ](http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620S) and the [20021231 W3C Software notice and license](http://www.w3.org/Consortium/Legal/2002/copyright-software-20021231)
+`ZLIB` |<bgcolor="#ffebbb"> No | Yes | The [zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php)
 `Zope` | Yes | 2.0, 2.1 | Zope Public License. For versions, consult [Zope.org](http://www.zope.org/Resources/License/)
-"""]] 
-
+"""]]
 
 **Problematic Licenses**
 
 [[!table data="""
 **keyword** | **Version needed?** | **GPL compatible** | **meaning**
-`CC` | Yes |<bgcolor="#ffcccc"> No | [Creative Commons Attribution License](http://creativecommons.org/). You should not upload anything prior 3.x. Read [Debian Creative Commons Workgroup report](http://evan.prodromou.name/Debian_Creative_Commons_Workgroup_report) by Evan Prodromou. CC license can easily lead to repackaging; CC-licensed material that does not meet DFSG have to be removed. This license is neither GPL nor GFDL compatible
-`MIT` |<bgcolor="#ffebbb"> No | | Several variants of the MIT license exist: (1) the standard version with three paragraphs (blanket permission, keep this notice, NO WARRANTY), (2) a version with a no-endorsement clause, and (3) other versions with slight wording differences. *License notice text needs to be copied verbatim*
+`CC` | Yes |<bgcolor="#ffcccc"> No | [Creative Commons Attribution License](http://creativecommons.org/). You should not upload anything prior 3.x. Read the [Debian Creative Commons Workgroup report](http://evan.prodromou.name/Debian_Creative_Commons_Workgroup_report) by Evan Prodromou. CC licenses can often require repackaging; CC-licensed material that does not meet the DFSG has to be removed. This license is neither GPL nor GFDL compatible.
+`MIT` |<bgcolor="#ffebbb"> No | | Several variants of the MIT license exist: (1) the standard version with three paragraphs (blanket permission, keep this notice, NO WARRANTY), (2) a version with a no-endorsement clause, and (3) other versions with slight wording differences. *License notice text needs to be copied verbatim.*
 `PD` |<bgcolor="#ffebbb"> No | | Being in the public domain is not a license. See Linux journal article ["Why the Public Domain Isn't a License"](http://www.linuxjournal.com/article/6225) by Lawrence Rosen. *License notice text needs to be copied verbatim*
-`PHP` | Yes |<bgcolor="#ffcccc"> No 3.01 | For versions, consult [PHP license](http://www.php.net/license). The PHP license may cause Debian FTP admin staff to [REJECT](http://ftp-master.debian.org/REJECT-FAQ.html) the package. The PHP license was designed for code contibuted to PHP language itself and not for developing PHP Web applications. It might be good idea to contact the author with suggestion to change to more safer LGPL or BSD license. See Debian mailing list threads [1](http://lists.debian.org/debian-legal/2005/08/msg00128.html), [2](http://lists.debian.org/debian-legal/2005/08/threads.html#00128), [3](http://lists.debian.org/debian-legal/2005/02/threads.html#00222), [4](http://lists.debian.org/debian-devel/2006/02/threads.html#00024), [5](http://lists.debian.org/debian-webapps/2006/04/threads.html#00008)
-`QPL` | Yes |<bgcolor="#ffcccc"> No 1.0 | For versions, consult [Trolltech](http://doc.trolltech.com). This is obsolete license for Qt. Suggest the author of the sources to study page [http://doc.trolltech.com/4.0/qpl.html](http://doc.trolltech.com/4.0/qpl.html)
+`PHP` | Yes |<bgcolor="#ffcccc"> No 3.01 | For versions, consult [PHP license](http://www.php.net/license). The PHP license may cause Debian FTP admin staff to [REJECT](http://ftp-master.debian.org/REJECT-FAQ.html) the package. The PHP license was designed for code contibuted to the PHP language itself and not for developing PHP Web applications. It might be a good idea to contact the author with suggestion to change to the LGPL or BSD license. See Debian mailing list threads [1](http://lists.debian.org/debian-legal/2005/08/msg00128.html), [2](http://lists.debian.org/debian-legal/2005/08/threads.html#00128), [3](http://lists.debian.org/debian-legal/2005/02/threads.html#00222), [4](http://lists.debian.org/debian-devel/2006/02/threads.html#00024), [5](http://lists.debian.org/debian-webapps/2006/04/threads.html#00008).
+`QPL` | Yes |<bgcolor="#ffcccc"> No 1.0 | For versions, consult [Trolltech](http://doc.trolltech.com). This is an obsolete license for Qt. Suggest the author of the sources to study [http://doc.trolltech.com/4.0/qpl.html](http://doc.trolltech.com/4.0/qpl.html).
 """]] 
 
 **License keyword "other"**
 
-Examples of licenses not listed
+Examples of licenses not listed:
 [OSI](http://www.opensource.org/licenses/alphabetical),
-[FSF](http://www.gnu.org/philosophy/license-list.html) pages. Should
-use License keyword `other`. The license notice is copied verbatim.
+[FSF](http://www.gnu.org/philosophy/license-list.html). Should use
+License keyword `other`. The license notice is copied verbatim.
 
 [[!table data="""
-**License** |
+License |
 Erlang Public License
-The [Expat license](http://www.jclark.com/xml/copying.txt). This license is equivalent to what many people mean by "the MIT license" or "the MIT/X11 license", but those names are too ambiguous as there are multiple incompatible versions of an "MIT/X11 license" in the wild. For clarity, it is better to refer to "the Expat license" as that name refers only to these license terms.
-The LaTeX Project Public License. For versions, consult [Latex project](http://www.latex-project.org/lppl/). GPL-incompatible. Note that works under any version of the License often have additional restrictions attached; check carefully.
+The [Expat license](http://www.jclark.com/xml/copying.txt). This license is equivalent to what many people mean by "the MIT license" or "the MIT/X11 license", but those names are ambiguous as there are multiple incompatible versions of an "MIT/X11 license" in the wild. For clarity, it is better to refer to "the Expat license" as that name refers only to these license terms.
+The LaTeX Project Public License. For versions, consult the [Latex project](http://www.latex-project.org/lppl/). GPL-incompatible. Note that works under any version of the License often have additional restrictions attached; check carefully.
 """]]
 
 #### Syntax
@@ -547,9 +543,9 @@
 The value of the field should follow the syntax of
 `debian/control`'s **`Depends`** field. The pipe character "|"
 is used for code that can be used under the terms of either licenses.
-The comma "," is used for code that must be used under the terms of both
-licenses (for rare cases where a single file contains code under both
-licenses).
+The comma "," is used for code whose use must comply with the terms of
+both licenses (for rare cases where a single file contains code under
+both licenses).
 
 For instance, this is a simple, "GPL version 2 or later" field:
 
@@ -593,12 +589,14 @@
 		Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=19
 		Upstream-Name: X Solitaire
 		Upstream-Source: ftp://ftp.example.com/pub/games
+
 		Files: *
 		Copyright: Copyright 1998, John Doe <jdoe at example.com>
 		License: GPL-2+
 		 On Debian systems the full text of the GNU General Public 
 		 License can be found in the `/usr/share/common-licenses/GPL'
 		 file.
+
 		Files: debian/*
 		Copyright: Copyright 1998, Jane Smith <jsmith at example.net>
 		License: other
@@ -611,6 +609,7 @@
 		Upstream-Name: Planet Venus
 		Upstream-Maintainer: John Doe <jdoe at example.com>
 		Upstream-Source: http://www.example.com/code/venus
+
 		Files: *
 		Copyright: Copyright 2008, John Doe <jdoe at example.com>
 		Copyright: Copyright 2007, Jane Smith <jsmith at example.org>
@@ -618,6 +617,7 @@
 		Copyright: Copyright 2007, J. Random User <jr at users.example.com>
 		License: PSF-2
 		 [LICENSE TEXT]
+
 		Files: debian/*
 		Copyright: Copyright 2008, Dan Developer <dan at debian.example.com>
 		License: GAP
@@ -625,22 +625,27 @@
 		 modification, are permitted in any medium without royalty
 		 provided the copyright notice and this notice are
 		 preserved.
+
 		Files: debian/patches/theme-diveintomark.patch
 		Copyright: Copyright 2008, Joe Hacker <hack at example.org>
 		License: GPL-2+
 		 [LICENSE TEXT]
+
 		Files: planet/vendor/compat_logging/*
 		Copyright: Copyright 2002, Mark Smith <msmith at example.org>
 		License: MIT
 		 [LICENSE TEXT]
+
 		Files: planet/vendor/httplib2/*
 		Copyright: Copyright 2006, John Brown <brown at example.org>
 		License: other
 		 Unspecified MIT style license.
+
 		Files: planet/vendor/feedparser.py
 		Copyright: Copyright 2007, Mike Smith <mike at example.org>
 		License: PSF-2
 		 [LICENSE TEXT]
+
 		Files: planet/vendor/htmltmpl.py
 		Copyright: Copyright 2004, Thomas Brown <coder at example.org>
 		License: GPL-2+

More information about the dep-commits mailing list