r113 - /web/deps/dep5.mdwn

vorlon at users.alioth.debian.org vorlon at users.alioth.debian.org
Thu Dec 17 11:47:35 UTC 2009


Author: vorlon
Date: Thu Dec 17 11:47:35 2009
New Revision: 113

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=113
Log:
merge revisions 31-40 from bzr to svn (by hand; bzr-svn no longer wants to play
nice in this configuration, see sftp://bzr.debian.org/bzr/dep/dep5/trunk/
for full history)

Modified:
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=113&op=diff
==============================================================================
--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Dec 17 11:47:35 2009
@@ -102,10 +102,12 @@
 
 Examples:
 
+	Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=19
 	Name: SOFTware
 	Maintainer: John Doe <john.doe at example.com>
 	Source: http://www.example.com/software/project
 
+	Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=19
 	Name: xyz
 	Maintainer: Jane Smith <jane.smith at example.com>
 	Source: http://www.example.com/gitwww
@@ -117,7 +119,7 @@
 
  * **`Files`**
    * Required. However, the first **`Files`** field can be omitted and its value will be assumed to be '*'.
-   * List of patterns indicating files having the same licence and sharing copyright holders. See "File patterns" below
+   * List of patterns indicating files having the same license and sharing copyright holders. See "File patterns" below
 
  * **`Copyright`**
    * Optional
@@ -127,9 +129,9 @@
 
  * **`License`**
   * Licensing terms for the files listed in the previous **`Files`** field
-    * First line: licence name(s) in abbreviated format (see *Short names* section). If empty, it is given the default value 'other'
+    * First line: license name(s) in abbreviated format (see *Short names* section). If empty, it is given the default value 'other'
     * Remaining lines: either copy the full text of the license(s), indicate a link to it (or them), or leave this part empty for using standalone **`License`** section(s) that matches the license short name(s) (see the *Standalone License Section* section).
-    * If the files have no copyright holders nor licence because they are in the Public Domain, the **`License`** field is used to indicate this fact.
+    * If the files have no copyright holders nor license because they are in the Public Domain, the **`License`** field is used to indicate this fact.
 
 Example:
 
@@ -140,7 +142,7 @@
 	 [LICENSE TEXT]
 
 ### Standalone License Section
-Where a set of files are dual (tri, etc) licensed, or when the same licence occurs multiple times, you can use a single line **`License`** field and standalone **`License`** fields to expand the license short names.
+Where a set of files are dual (tri, etc) licensed, or when the same license occurs multiple times, you can use a single line **`License`** field and standalone **`License`** fields to expand the license short names.
 
 Example 1 (tri-licensed files).
 
@@ -242,18 +244,17 @@
 frequently used licenses through a list of unambiguous short names. For the
 licenses existing in multiple versions, the version number is added, using a
 dash as a separator. If omitted, the lowest version number is implied. When the
-licence permits to use the terms of any later version, the short name is
+license permits to use the terms of any later version, the short name is
 finished with a plus sign.
 
 
 [[!table data="""
 **keyword** | **meaning**
-`Apache` | Apache license
-`Artistic` | Artistic license
+`Apache` | Apache license. For versions, consult the [Apache Software Foundation](http://www.apache.org/licenses/).
+`Artistic` | Artistic license. For versions, consult the [Perl Foundation](http://www.perlfoundation.org/perl5/index.cgi?action=revision_list;page_name=artistic_license)
 `BSD` | Berkeley software distribution license
-`NetBSD` | NetBSD Foundation's (TNF) license
 `FreeBSD` | FreeBSD Project license
-`ISC` | Internet Software Consortium's license, sometimes also known as the OpenBSD License
+`ISC` | [Internet Software Consortium](http://opensource.org/licenses/isc-license.txt)'s license, sometimes also known as the OpenBSD License
 `CC-BY` | Creative Commons Attribution license
 `CC-BY-SA` | Creative Commons Attribution Share Alike license
 `CC-BY-ND` | Creative Commons Attribution No Derivatives
@@ -261,41 +262,81 @@
 `CC-BY-NC-SA` | Creative Commons Attribution Non-Commercial Share Alike
 `CC-BY-NC-ND` | Creative Commons Attribution Non-Commercial No Derivatives
 `CC0` | Creative Commons Universal waiver
-`CDDL` | Common Development and Distribution License
-`CPL` | IBM Common Public License
-`Eiffel` | The Eiffel Forum License
+`CDDL` | Common Development and Distribution License. For versions, consult [Sun Microsystems](http://www.sun.com/cddl/).
+`CPL` | IBM Common Public License. For versions, consult the [IBM Common Public License (CPL) Frequently asked questions](http://www.ibm.com/developerworks/library/os-cplfaq.html).
+`Eiffel` | The Eiffel Forum License. For versions, consult the [Open Source Initiative](http://www.opensource.org/licenses/eiffel.html)
 `Expat` | The Expat license
 `GPL` | GNU General Public License
 `LGPL` | GNU Lesser General Public License, (GNU Library General Public License for versions lower than 2.1)
 `GFDL` | GNU Free Documentation License
+`GFDL-NIV` | GNU Free Documentation License, with no invariant sections
 `LPPL` | LaTeX Project Public License
-`MPL` | Mozilla Public License
+`MPL` | Mozilla Public License. For versions, consult [Mozilla.org](http://www.mozilla.org/MPL)
 `Perl` | Perl license (equates to "GPL-1+ or Artistic-1
 `PHP` | PHP license
-`PSF` | Python Software Foundation license
+`PSF` | Python Software Foundation license. For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/)
 `QPL` | Q Public License
-`W3C-Software` | W3C Software License
-`ZLIB` | zlib/libpng license
-`Zope` | Zope Public License
+`W3C-Software` | 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` | [zlib/libpng license](http://www.opensource.org/licenses/zlib-license.php)
+`Zope` | Zope Public License. For versions, consult [Zope.org](http://www.zope.org/Resources/License/)
 `other` | Any other custom license. *License notice text must be copied verbatim.*
 """]]
 
-Exemptions and clarifications are signalled in plain text, by "with
-''keywords'' exemption". This document provides a list of keywords that refer
-to the most frequent exemptions.
-
-The GPL "`Font`" clarification refers to the text added to the
+Exceptions and clarifications are signalled in plain text, by appending
+"with '''keywords''' exception" to the short name.  This document provides a
+list of keywords that refer to the most frequent exceptions.
+
+The GPL "`Font`" exception refers to the text added to the
 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:
-
-The GPL "`OpenSSL`" clarification gives permission to linked code with OpenSSL library, which contains GPL-incompatible clauses.
-
+fonts?](http://www.gnu.org/licenses/gpl-faq.html#FontException).  The precise
+text corresponding to this exception is:
+
+> As a special exception, if you create a document which uses this font,
+> and embed this font or unaltered portions of this font into the
+> document, this font does not by itself cause the resulting document to
+> be covered by the GNU General Public License. This exception does not
+> however invalidate any other reasons why the document might be covered
+> by the GNU General Public License. If you modify this font, you may
+> extend this exception to your version of the font, but you are not
+> obligated to do so. If you do not wish to do so, delete this exception
+> statement from your version.
+
+The GPL "`OpenSSL`" exception gives permission to link GPL-licensed
+code with the OpenSSL library, which contains GPL-incompatible clauses.
+For more information, see ["The -OpenSSL License and The
+GPL"](http://www.gnome.org/~markmc/openssl-and-the-gpl.html) by Mark
+McLoughlin and the message ["middleman software license conflicts with
+OpenSSL"](http://lists.debian.org/debian-legal/2004/05/msg00595.html)
+by Mark McLoughlin on the `debian-legal` mailing list.  The text corresponding
+to this exception is:
+
+> In addition, as a special exception, the copyright holders give
+> permission to link the code of portions of this program with the
+> OpenSSL library under certain conditions as described in each
+> individual source file, and distribute linked combinations including
+> the two.
+
+> You must obey the GNU General Public License in all respects for all
+> of the code used other than OpenSSL. If you modify file(s) with this
+> exception, you may extend this exception to your version of the
+> file(s), but you are not obligated to do so. If you do not wish to do
+> so, delete this exception statement from your version. If you delete
+> this exception statement from all source files in the program, then
+> also delete it here.
+
+** Problematic Licenses**
+
+The following license names are well known, but ambiguously refer to a number
+of different licenses, in ways not easily addressed by the use of version
+numbers or exception qualifiers.  They are therefore not included as
+standard short names in this specification.
 
 [[!table data="""
-**keyword** | **Version needed?** | **GPL compatible** | **meaning**
-`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*
+**license name** | **problem**
+`MIT` | 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.
+`PD` | 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.  If the work is truly public domain, this should be stated in the copyright field.
+`PHP` | The PHP license contains terms which can only reasonably be met when applied to the PHP language itself.  Since software other than PHP which uses this license will be rejected from Debian, there's no need for a shared standard keyword.
+"""]]
 
 #### Syntax
 License names are case-insensitive.
@@ -330,9 +371,9 @@
 A GPL-2+ work with the OpenSSL exception is in effect a dual-licensed
 work that can be redistributed either under the GPL-2+, or under the
 GPL-2+ with the OpenSSL exception. It is thus expressed as
-`GPL-2+ with OpenSSL exemption`:
-
-		License: GPL-2+ with OpenSSL exemption
+`GPL-2+ with OpenSSL exception`:
+
+		License: GPL-2+ with OpenSSL exception
 		 In addition, as a special exception, the author of this
 		 program gives permission to link the code of its 
 		 release with the OpenSSL project's "OpenSSL" library (or
@@ -356,6 +397,7 @@
 #### Simple
 A possible `copyright` file for the program 'X Solitaire' distributed in the Debian source package `xsol`:
 
+		Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=19
 		Name: X Solitaire
 		Source: ftp://ftp.example.com/pub/games
 
@@ -373,6 +415,7 @@
 #### Complex
 A possible `copyright` file for the program 'Planet Venus', distributed in the Debian source package `planet-venus`:
 
+		Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=19
 		Name: Planet Venus
 		Maintainer: John Doe <jdoe at example.com>
 		Source: http://www.example.com/code/venus
@@ -420,7 +463,7 @@
 		 file.
 
 
-## Appendix: Note about the use of this format in Debian:
+## Appendix: Note about the use of this format in Debian
 
 The Debian Policy (§12.5) demands that each packages is accompanied by a file,
 `debian/copyright` in source packages and `/usr/share/doc/package/copyright` in




More information about the dep-commits mailing list