r153 - /web/deps/dep5.mdwn

Thu Jan 6 20:39:39 UTC 2011

Author: lars
Date: Thu Jan  6 20:39:37 2011
New Revision: 153

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=153
Log:
CANDIDATE version of DEP5.

Modified:
    web/deps/dep5.mdwn

Modified: web/deps/dep5.mdwn
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=153&op=diff
==============================================================================

--- web/deps/dep5.mdwn (original)
+++ web/deps/dep5.mdwn Thu Jan  6 20:39:37 2011
@@ -1,14 +1,9 @@
 [[!meta title="DEP-5: Machine-readable debian/copyright"]]
-
-Do not use this revision. Use revision 135 in svn for now,
-while new drafts are being changed.
-See <http://wiki.debian.org/Proposals/CopyrightFormat> for that
-process.
 
     Title: Machine-readable debian/copyright
     DEP: 5
-    State: DRAFT
-    Date: 2010-08-23
+    State: CANDIDATE
+    Date: 2011-01-06
     Drivers: Steve Langasek <vorlon at debian.org>,
      Lars Wirzenius <liw at liw.fi>
     URL: http://dep.debian.net/deps/dep5
@@ -382,13 +377,17 @@
 added, using a dash as a separator. If omitted, the lowest version number is
 implied. When the license grant permits using the terms of any later version
 of that license, the short name is finished with a plus sign.
+For SPDX compatibility, trailing "dot-zeroes" are considered to be equal
+to plainer version (e.g., "2.0.0" is considered equal to "2.0" and "2").
 
 
 [[!table data="""
 **keyword** | **meaning**
 `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/legal)
-`BSD` | Berkeley software distribution license
+`BSD-2-clause` | Berkeley software distribution license, 2-clause version
+`BSD-3-clause` | Berkeley software distribution license, 3-clause version
+`BSD-4-clause` | Berkeley software distribution license, 4-clause version
 `FreeBSD` | FreeBSD Project 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
@@ -400,7 +399,7 @@
 `CC0` | Creative Commons Universal waiver
 `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)
+`EFL` | 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)
@@ -408,14 +407,17 @@
 `GFDL-NIV` | GNU Free Documentation License, with no invariant sections
 `LPPL` | LaTeX Project 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")
-`PSF` | Python Software Foundation license. For versions, consult the [Python Software Foundation](http://www.python.org/psf/license/)
+`Perl` | Perl license (use "GPL-1+ or Artistic-1" instead)
+`Python-CNRI` | 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. 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)
+`W3C` | 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.*
 """]]
+
+There are [many versions of the MIT 
+license](http://en.wikipedia.org/wiki/MIT_License#Various_versions).
+Please use Expat instead, when it matches.
 
 Exceptions and clarifications are signaled in plain text, by appending
 "with '''keywords''' exception" to the short name.  This document provides a
@@ -458,20 +460,6 @@
 > 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="""
-**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
@@ -551,7 +539,9 @@
 associated with a software package. It and the machine-readable
 `debian/copyright` format attempt to be somewhat compatible.
 However, the two formats have different aims, and so the formats
-are different.
+are different. 
+The [DEP5 wiki page](http://wiki.debian.org/Proposals/CopyrightFormat)
+will be used to track the differences.
 
 
 # Examples


