[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

DEP5: Editorial changes



I propose the attached patch to make some editorial changes to DEP5. A
summary of the changes is below. I believe these should be
uncontroversial and that they do not change the meaning of the spec, but
do make it easier to read and edit.

If nobody objects, I'll apply and push this in a day or two. Later
objections are OK, they just mean I will revert all or some of this.

Remove paragraph repeating information from earlier in the document.
Make all examples be indented by 4 spaces, not 8.
Rename "section" to "paragraph", for consistency.
Expand tabs to 4 spaces.
Add a link to policy.
Get rid of pointless double backquotes.
Fold sub-bullet for Copyright into main description.
Remove Copyright example.
Remove second example, as it does not add anything.
Remove 'On Debian systems'.
Simplify description of Upstream-Contact.
Simplify description of Upstream-Name.
Change 'Value:' prefix to 'Syntax:' prefix.
Remove 'Syntax:' prefix from field descriptions.
Replace multple "single occurence" with a note in the general file
syntax section.


=== modified file 'dep5.mdwn'
--- dep5.mdwn	2010-08-31 21:08:28 +0000
+++ dep5.mdwn	2010-09-07 05:46:26 +0000
@@ -1,20 +1,20 @@
 [[!meta title="DEP-5: Machine-readable debian/copyright"]]
 
-	Title: Machine-readable debian/copyright
-	DEP: 5
-	State: DRAFT
-	Date: 2010-08-23
-	Drivers: Steve Langasek <vorlon@debian.org>,
-	 Lars Wirzenius <liw@liw.fi>
-	URL: http://dep.debian.net/deps/dep5
-	License:
-	 Copying and distribution of this file, with or without modification,
-	 are permitted in any medium without royalty provided the copyright
-	 notice and this notice are preserved.
-	Abstract:
-	 Establish a standard, machine-readable format for debian/copyright
-	 files within packages, to facilitate automated checking and
-	 reporting of licenses for packages and sets of packages.
+    Title: Machine-readable debian/copyright
+    DEP: 5
+    State: DRAFT
+    Date: 2010-08-23
+    Drivers: Steve Langasek <vorlon@debian.org>,
+     Lars Wirzenius <liw@liw.fi>
+    URL: http://dep.debian.net/deps/dep5
+    License:
+     Copying and distribution of this file, with or without modification,
+     are permitted in any medium without royalty provided the copyright
+     notice and this notice are preserved.
+    Abstract:
+     Establish a standard, machine-readable format for debian/copyright
+     files within packages, to facilitate automated checking and
+     reporting of licenses for packages and sets of packages.
 
 [[!toc ]]
 
@@ -113,15 +113,16 @@
 For example, `Disclaimer` has no special first line, whereas
 `License` does.
 
+Each field may occur at most once in a paragraph.
+
 # Implementation
-## Sections
-### Header Section (Once)
+## Paragraps
+### Header paragraph (Once)
 
  * **`Format`**
    * Required
-   * Single occurrence
-   * Value: single line
-   * Syntax: URI of the format specification, such as:
+   * Syntax: single line
+   * URI of the format specification, such as:
      * http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
      * Note that the unwieldy length of the URL should be solved in
        future by hosting the specification at a shorter URL (including the
@@ -129,39 +130,33 @@
 
  * **`Upstream-Name`**
    * Optional
-   * Single occurrence
-   * Value: single line
-   * Syntax: Single line (in most cases a single word),
-     containing the name upstream uses for the software.
+   * Syntax: single line
+   * The name upstream uses for the software.
 
  * **`Upstream-Contact`**
    * Optional
-   * Single occurrence
-   * Value: line based list
-   * Syntax: Line(s) containing the preferred address(es) to reach 
+   * Syntax: line based list
+   * The preferred address(es) to reach 
      the upstream project. May be free-form text, but by convention
      will usually be written as a list of RFC2822 addresses or URIs.
 
  * **`Source`**
    * Optional
-   * Single occurrence
-   * Value: line based list
-   * Syntax: One or more URIs, indicating the primary
+   * Syntax: line based list
+   * One or more URIs, indicating the primary
      points of distribution of the software.
 
  * **`Disclaimer`**
    * Optional
-   * Single occurrence
-   * Value: formatted text, no synopsis
-   * Syntax: On Debian systems, this field can be
+   * Syntax: formatted text, no synopsis
+   * This field can be
      used in the case of non-free and contrib packages (see [Policy
      12.5](
      http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile))
 
  * **`Comment`**
    * Optional
-   * Single occurrence per paragraph, can occur in each paragraph.
-   * Value: formatted text, no synopsis
+   * Syntax: formatted text, no synopsis
    * Description: This field can provide additional information. For
      example, it might quote an e-mail from upstream
      justifying why the license is acceptable to the main archive, or
@@ -169,19 +164,14 @@
      from a version known to be DFSG-free, even though the current
      upstream version is not.
 
-Examples:
-
-	Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-	Upstream-Name: SOFTware
-	Upstream-Contact: John Doe <john.doe@example.com>
-	Source: http://www.example.com/software/project
-
-	Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-	Upstream-Name: xyz
-	Upstream-Contact: Jane Smith <jane.smith@example.com>
-	Source: http://www.example.com/gitwww
-
-### Files Section (Repeatable)
+Example:
+
+    Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+    Upstream-Name: SOFTware
+    Upstream-Contact: John Doe <john.doe@example.com>
+    Source: http://www.example.com/software/project
+
+### Files paragraph (Repeatable)
 
 The declaration of copyright and license for files is done in one or more
 paragraphs.  In the simplest case, a single paragraph can be used which
@@ -191,102 +181,105 @@
    * Required for all but the first paragraph.
      If omitted from the first paragraph,
      this is equivalent to a value of '*'.
-   * Value: white space separated list
-   * Syntax: List of patterns indicating files covered by the license
+   * Syntax: white space separated list
+   * List of patterns indicating files covered by the license
      and copyright specified in this paragraph.  See "File patterns" below.
 
  * **`Copyright`**
    * Required
-   * Value: line based list
-   * Syntax: one or more free-form copyright statement(s), one per line,
+   * Syntax: line based list
+   * One or more free-form copyright statement(s), one per line,
      that apply to the files matched by the above pattern.
-     * Example value: 2008, John Q. Holder <john.holder@example.org>
-     * If a work has no copyright holder (i.e., it is in the public
-       domain), that information should be recorded here.
+     If a work has no copyright holder (i.e., it is in the public
+     domain), that information should be recorded here.
 
  * **`License`**
-   * Licensing terms for the files listed in **`Files`** field for this section
+   * Licensing terms for the files listed in **`Files`** field for this paragraph
    * Required
-   * Value: formatted text, with synopsis
-   * Syntax:
-     * First line: an abbreviated name for the license (see *Short names*
-       section for a list of standard abbreviations). If empty, it is
-       given the default value 'other'.  Only one license per file can
-       use this default value; if there is more than one license present
-       in the package without a standard short name, an arbitrary short
-       name may be assigned for these licenses.  These arbitrary names
-       are only guaranteed to be unique within a single copyright file.
-     * Remaining lines: if left blank here, the file **must** include
-       a stand-alone **`License`** section matching each license short
-       name listed on the first line (see the *Standalone License Section*
-       section).  Otherwise, this field should either include the full text
-       of the license(s) or include a pointer to the license file under
-       ``/usr/share/common-licenses``.  This field should include all text
-       needed in order to fulfill both Debian Policy's requirement for
-       including a copy of the software's distribution license (§12.5),
-       and any license requirements to include warranty disclaimers or
-       other notices with the binary package.
+   * Syntax: formatted text, with synopsis
+   * First line: an abbreviated name for the license (see *Short names*
+     section for a list of standard abbreviations). If empty, it is
+     given the default value 'other'.  Only one license per file can
+     use this default value; if there is more than one license present
+     in the package without a standard short name, an arbitrary short
+     name may be assigned for these licenses.  These arbitrary names
+     are only guaranteed to be unique within a single copyright file.
+   * Remaining lines: if left blank here, the file **must** include
+     a stand-alone **`License`** paragraph matching each license short
+     name listed on the first line (see the *Standalone License Paragraph*
+     section).  Otherwise, this field should either include the full text
+     of the license(s) or include a pointer to the license file under
+     `/usr/share/common-licenses`.  This field should include all text
+     needed in order to fulfill both Debian Policy's requirement for
+     including a copy of the software's distribution license 
+     (<a href="http://www.debian.org/doc/debian-policy/ch-docs.html#s-copyrightfile";>§12.5</a>),
+     and any license requirements to include warranty disclaimers or
+     other notices with the binary package.
+
+ * **`Comment`**
+   * Same as in the header paragraph.
+
 
 Example:
 
-	Files: *
-	Copyright: 2008, John Doe <john.doe@example.com>
-	           2007, Jane Smith <jane.smith@example.com>
-	License: PSF-2
-	 [LICENSE TEXT]
+    Files: *
+    Copyright: 2008, John Doe <john.doe@example.com>
+               2007, Jane Smith <jane.smith@example.com>
+    License: PSF-2
+     [LICENSE TEXT]
 
-### Standalone License Section
+### Standalone License Paragraph
 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`** paragraphs to expand the license short names.
 
 Example 1 (tri-licensed files).
 
-	Files: src/js/editline/*
-	Copyright: 1993, John Doe
-	           1993, Joe Average
-	License: MPL-1.1 or GPL-2 or LGPL-2.1
-        
-	License: MPL-1.1
-	 [LICENSE TEXT]
-        
-	License: GPL-2
-	 [LICENSE TEXT]
-        
-	License: LGPL-2.1
-	 [LICENSE TEXT]
+    Files: src/js/editline/*
+    Copyright: 1993, John Doe
+               1993, Joe Average
+    License: MPL-1.1 or GPL-2 or LGPL-2.1
+    
+    License: MPL-1.1
+     [LICENSE TEXT]
+    
+    License: GPL-2
+     [LICENSE TEXT]
+    
+    License: LGPL-2.1
+     [LICENSE TEXT]
 
 
 Example 2 (recurrent license).
 
-	Files: src/js/editline/*
-	Copyright: 1993, John Doe
-	           1993, Joe Average
-	License: MPL-1.1
-
-	Files: src/js/fdlibm/*
-	Copyright: 1993, J-Random Corporation
-	License: MPL-1.1
-
-	License: MPL-1.1
-	 [LICENSE TEXT]
+    Files: src/js/editline/*
+    Copyright: 1993, John Doe
+               1993, Joe Average
+    License: MPL-1.1
+
+    Files: src/js/fdlibm/*
+    Copyright: 1993, J-Random Corporation
+    License: MPL-1.1
+
+    License: MPL-1.1
+     [LICENSE TEXT]
 
 ### Extra fields.
 
-Extra fields can be added to any section. Their name starts by **`X-`**.
+Extra fields can be added to any paragraph. Their name starts by **`X-`**.
 
 ## Fields Detail
 ### Files
 #### Format
 The **`Files`** field contains a list of comma-separated patterns
 
-	Files: foo.c, bar.*, baz.[ch]
+    Files: foo.c, bar.*, baz.[ch]
 
 File names containing spaces or commas should be put within double
 quotes. The backslash character is an escaping character, be it inside
 or outside double quotes:
 
-	Files: "Program Files/*", manual[english].txt
+    Files: "Program Files/*", manual[english].txt
 
 #### Syntax
 Patterns are handled as by the `find` utility's `-name` option.  Patterns
@@ -296,15 +289,15 @@
 The following matches all `Makefile.am` files in the tree and all
 Python scripts:
 
-	Files: */Makefile.am, *.py
+    Files: */Makefile.am, *.py
 
 But this will only match the top-level `Makefile.am`:
 
-	Files: ./Makefile.am
+    Files: ./Makefile.am
 
 For the first example, the equivalent `find` command would be:
 
-	find . -path "*/Makefile.am" -o -name "*.py"
+    find . -path "*/Makefile.am" -o -name "*.py"
 
 It is quite common for a work to have files with copyright held by
 different parties and received under different licenses. To accommodate
@@ -323,15 +316,15 @@
 `Files: *` and `Files: getopt.*`; only the last match counts, so
 the file `getopt.c` has the license declaration `License: BSD`.
 
-	Files: *
-	Copyright: 2003-2005, John Doe <jdoe@xample.com>
-	License: [the main work's license]
-	 [LICENSE TEXT]
+    Files: *
+    Copyright: 2003-2005, John Doe <jdoe@xample.com>
+    License: [the main work's license]
+     [LICENSE TEXT]
 
-	Files: getopt.*
-	Copyright: 2000, The Corporation Foundation, Inc.
-	License: BSD
-	 [LICENSE TEXT]
+    Files: getopt.*
+    Copyright: 2000, The Corporation Foundation, Inc.
+    License: BSD
+     [LICENSE TEXT]
 
 ### License
 #### Short name
@@ -357,7 +350,7 @@
 to include the full license text in `debian/copyright`, nor any requirements
 in the license of the work regarding reproduction of legal notices.  This
 information must still be included in the `License` field, either in a
-stand-alone license section or in the relevant files section.
+stand-alone license paragraph or in the relevant files paragraph.
 
 For licenses which have multiple versions in use, the version number is
 added, using a dash as a separator. If omitted, the lowest version number is
@@ -463,15 +456,15 @@
 
 For instance, this is a simple, "GPL version 2 or later" field:
 
-		License: GPL-2+
+    License: GPL-2+
 
 This is a dual-licensed GPL/Artistic work such as Perl:
 
-		License: GPL-2+ or Artistic-2.0
+    License: GPL-2+ or Artistic-2.0
 
 This is for a file that has both GPL and classic BSD code in it:
 
-		License: GPL-2+ and BSD
+    License: GPL-2+ and BSD
 
 For the most complex cases, the comma is used to disambiguate the priority of
 `or`s and `and`s: `and` has the priority over `or`, unless preceded by a comma.
@@ -482,46 +475,46 @@
 
 This is for a file that has Perl code and classic BSD code in it:
 
-		License: GPL-2+ or Artistic-2.0, and BSD
+    License: GPL-2+ or Artistic-2.0, and BSD
 
 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 exception`:
 
-		License: GPL-2+ with OpenSSL exception
-		 This program is free software; you can redistribute it
-		 and/or modify it under the terms of the GNU General Public
-		 License as published by the Free Software Foundation; either
-		 version 2 of the License, or (at your option) any later
-		 version.
-		 .
-		 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
-		 with modified versions of it that use the same license as
-		 the "OpenSSL" library), and distribute the linked
-		 executables. You must obey the GNU General Public 
-		 License in all respects for all of the code used other 
-		 than "OpenSSL".  If you modify this file, you may extend
-		 this exception to your version of the file, but you are
-		 not obligated to do so.  If you do not wish to do so,
-		 delete this exception statement from your version.
-		 .
-		 This program is distributed in the hope that it will be
-		 useful, but WITHOUT ANY WARRANTY; without even the implied
-		 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-		 PURPOSE.  See the GNU General Public License for more
-		 details.
-		 .
-		 You should have received a copy of the GNU General Public
-		 License along with this package; if not, write to the Free
-		 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-		 Boston, MA  02110-1301 USA
-		 .
-		 On Debian systems, the full text of the GNU General Public
-		 License version 2 can be found in the file
-		 `/usr/share/common-licenses/GPL-2'.
+    License: GPL-2+ with OpenSSL exception
+     This program is free software; you can redistribute it
+     and/or modify it under the terms of the GNU General Public
+     License as published by the Free Software Foundation; either
+     version 2 of the License, or (at your option) any later
+     version.
+     .
+     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
+     with modified versions of it that use the same license as
+     the "OpenSSL" library), and distribute the linked
+     executables. You must obey the GNU General Public 
+     License in all respects for all of the code used other 
+     than "OpenSSL".  If you modify this file, you may extend
+     this exception to your version of the file, but you are
+     not obligated to do so.  If you do not wish to do so,
+     delete this exception statement from your version.
+     .
+     This program is distributed in the hope that it will be
+     useful, but WITHOUT ANY WARRANTY; without even the implied
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the GNU General Public License for more
+     details.
+     .
+     You should have received a copy of the GNU General Public
+     License along with this package; if not, write to the Free
+     Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+     Boston, MA  02110-1301 USA
+     .
+     On Debian systems, the full text of the GNU General Public
+     License version 2 can be found in the file
+     `/usr/share/common-licenses/GPL-2'.
 
 
 
@@ -532,105 +525,105 @@
 A possible `copyright` file for the program 'X Solitaire' distributed in the
 Debian source package `xsol`:
 
-		Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-		Upstream-Name: X Solitaire
-		Source: ftp://ftp.example.com/pub/games
-
-		Copyright: 1998, John Doe <jdoe@example.com>
-		License: GPL-2+
-		 This program is free software; you can redistribute it
-		 and/or modify it under the terms of the GNU General Public
-		 License as published by the Free Software Foundation; either
-		 version 2 of the License, or (at your option) any later
-		 version.
-		 .
-		 This program is distributed in the hope that it will be
-		 useful, but WITHOUT ANY WARRANTY; without even the implied
-		 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-		 PURPOSE.  See the GNU General Public License for more
-		 details.
-		 .
-		 You should have received a copy of the GNU General Public
-		 License along with this package; if not, write to the Free
-		 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-		 Boston, MA  02110-1301 USA
-		 .
-		 On Debian systems, the full text of the GNU General Public
-		 License version 2 can be found in the file
-		 `/usr/share/common-licenses/GPL-2'.
-
-		Files: debian/*
-		Copyright: 1998, Jane Smith <jsmith@example.net>
-		License:
-		 [LICENSE TEXT]
+    Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+    Upstream-Name: X Solitaire
+    Source: ftp://ftp.example.com/pub/games
+
+    Copyright: 1998, John Doe <jdoe@example.com>
+    License: GPL-2+
+     This program is free software; you can redistribute it
+     and/or modify it under the terms of the GNU General Public
+     License as published by the Free Software Foundation; either
+     version 2 of the License, or (at your option) any later
+     version.
+     .
+     This program is distributed in the hope that it will be
+     useful, but WITHOUT ANY WARRANTY; without even the implied
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the GNU General Public License for more
+     details.
+     .
+     You should have received a copy of the GNU General Public
+     License along with this package; if not, write to the Free
+     Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+     Boston, MA  02110-1301 USA
+     .
+     On Debian systems, the full text of the GNU General Public
+     License version 2 can be found in the file
+     `/usr/share/common-licenses/GPL-2'.
+
+    Files: debian/*
+    Copyright: 1998, Jane Smith <jsmith@example.net>
+    License:
+     [LICENSE TEXT]
 
 #### Complex
 A possible `copyright` file for the program 'Planet Venus', distributed in the
 Debian source package `planet-venus`:
 
-		Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
-		Upstream-Name: Planet Venus
-		Upstream-Contact: John Doe <jdoe@example.com>
-		Source: http://www.example.com/code/venus
-
-		Copyright: 2008, John Doe <jdoe@example.com>
-		           2007, Jane Smith <jsmith@example.org>
-		           2007, Joe Average <joe@example.org>
-		           2007, J. Random User <jr@users.example.com>
-		License: PSF-2
-		 [LICENSE TEXT]
-
-		Files: debian/*
-		Copyright: 2008, Dan Developer <dan@debian.example.com>
-		License:
-		 Copying and distribution of this package, with or without
-		 modification, are permitted in any medium without royalty
-		 provided the copyright notice and this notice are
-		 preserved.
-
-		Files: debian/patches/theme-diveintomark.patch
-		Copyright: 2008, Joe Hacker <hack@example.org>
-		License: GPL-2+
-		 [LICENSE TEXT]
-
-		Files: planet/vendor/compat_logging/*
-		Copyright: 2002, Mark Smith <msmith@example.org>
-		License: MIT
-		 [LICENSE TEXT]
-
-		Files: planet/vendor/httplib2/*
-		Copyright: 2006, John Brown <brown@example.org>
-		License: MIT2
-		 Unspecified MIT style license.
-
-		Files: planet/vendor/feedparser.py
-		Copyright: 2007, Mike Smith <mike@example.org>
-		License: PSF-2
-		 [LICENSE TEXT]
-
-		Files: planet/vendor/htmltmpl.py
-		Copyright: 2004, Thomas Brown <coder@example.org>
-		License: GPL-2+
-		 This program is free software; you can redistribute it
-		 and/or modify it under the terms of the GNU General Public
-		 License as published by the Free Software Foundation; either
-		 version 2 of the License, or (at your option) any later
-		 version.
-		 .
-		 This program is distributed in the hope that it will be
-		 useful, but WITHOUT ANY WARRANTY; without even the implied
-		 warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-		 PURPOSE.  See the GNU General Public License for more
-		 details.
-		 .
-		 You should have received a copy of the GNU General Public
-		 License along with this package; if not, write to the Free
-		 Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-		 Boston, MA  02110-1301 USA
-		 .
-		 On Debian systems, the full text of the GNU General Public
-		 License version 2 can be found in the file
-		 `/usr/share/common-licenses/GPL-2'.
+    Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+    Upstream-Name: Planet Venus
+    Upstream-Contact: John Doe <jdoe@example.com>
+    Source: http://www.example.com/code/venus
+
+    Copyright: 2008, John Doe <jdoe@example.com>
+               2007, Jane Smith <jsmith@example.org>
+               2007, Joe Average <joe@example.org>
+               2007, J. Random User <jr@users.example.com>
+    License: PSF-2
+     [LICENSE TEXT]
+
+    Files: debian/*
+    Copyright: 2008, Dan Developer <dan@debian.example.com>
+    License:
+     Copying and distribution of this package, with or without
+     modification, are permitted in any medium without royalty
+     provided the copyright notice and this notice are
+     preserved.
+
+    Files: debian/patches/theme-diveintomark.patch
+    Copyright: 2008, Joe Hacker <hack@example.org>
+    License: GPL-2+
+     [LICENSE TEXT]
+
+    Files: planet/vendor/compat_logging/*
+    Copyright: 2002, Mark Smith <msmith@example.org>
+    License: MIT
+     [LICENSE TEXT]
+
+    Files: planet/vendor/httplib2/*
+    Copyright: 2006, John Brown <brown@example.org>
+    License: MIT2
+     Unspecified MIT style license.
+
+    Files: planet/vendor/feedparser.py
+    Copyright: 2007, Mike Smith <mike@example.org>
+    License: PSF-2
+     [LICENSE TEXT]
+
+    Files: planet/vendor/htmltmpl.py
+    Copyright: 2004, Thomas Brown <coder@example.org>
+    License: GPL-2+
+     This program is free software; you can redistribute it
+     and/or modify it under the terms of the GNU General Public
+     License as published by the Free Software Foundation; either
+     version 2 of the License, or (at your option) any later
+     version.
+     .
+     This program is distributed in the hope that it will be
+     useful, but WITHOUT ANY WARRANTY; without even the implied
+     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the GNU General Public License for more
+     details.
+     .
+     You should have received a copy of the GNU General Public
+     License along with this package; if not, write to the Free
+     Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+     Boston, MA  02110-1301 USA
+     .
+     On Debian systems, the full text of the GNU General Public
+     License version 2 can be found in the file
+     `/usr/share/common-licenses/GPL-2'.
 
 
 ## Appendix: Note about the use of this format in Debian
@@ -645,13 +638,7 @@
 it, so that review efforts can be easily reproduced and shared. 
 
 The copyright of the Debian packaging and the history of package maintainers is
-simply indicated in a **`Files: debian/*`** section.
-
-The Policy section §12.5 demands that packages distributed in the ''non-free''
-and ''contrib'' sections of the Debian archive carry a disclaimer in
-`debian/copyright` that reminds that these packages are not part of the Debian
-operating system, and explain why they can not be distributed in the ''main''
-section. The **`Disclaimer`** field was created for this purpose.
+simply indicated in a **`Files: debian/*`** paragraph.
 
 For a ''non-free'' package to be autobuilt, `debian/copyright` must contain an
 explanation that autobuilding is not forbidden (see


Reply to: