r215 - // /web/deps/dep5/copyright-format.xml

[vorlon at users.alioth.debian.org]

Author: vorlon
Date: Wed Nov 30 22:33:10 2011
New Revision: 215

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=215
Log:
catch up with debian-policy docbook; from here on it should be possible to
push changes the other way via the DEP process.

Modified:
    /   (props changed)
    web/deps/dep5/copyright-format.xml

Modified: web/deps/dep5/copyright-format.xml
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=215&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Wed Nov 30 22:33:10 2011
@@ -182,7 +182,7 @@
         <title><varname>Format</varname></title>
         <para>
           Required single line: URI of the format specification, such as:
-          <literal>http://www.debian.org/doc/copyright-format/1.0</literal>
+          <literal>http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</literal>
         </para>
       </section>
 
@@ -275,7 +275,7 @@
 
       <section id="example-header-paragraph">
         <title>Example header paragraph</title>
-<programlisting>Format: <VERSIONED_FORMAT_URL>
+<programlisting>Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: SOFTware
 Upstream-Contact: John Doe <john.doe at example.com>
 Source: http://www.example.com/software/project</programlisting>
@@ -485,7 +485,7 @@
  [LICENSE TEXT]
 
 License: LGPL-2.1
- LICENSE TEXT]</programlisting>
+ [LICENSE TEXT]</programlisting>
       </example>
 
       <example>
@@ -1069,7 +1069,7 @@
         A possible <filename>debian/copyright</filename> file for the program
         <quote>X Solitaire</quote> distributed in the Debian source package
         <literal>xsol</literal>:
-<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL>
+<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: X Solitaire
 Source: ftp://ftp.example.com/pub/games
 
@@ -1099,7 +1099,7 @@
 
 Files: debian/*
 Copyright: Copyright 1998 Jane Smith <jsmith at example.net>
-License:
+License: GPL-2+
  [LICENSE TEXT]]]></programlisting>
       </para>
     </example>
@@ -1110,7 +1110,7 @@
         A possible <filename>debian/copyright</filename> file for the program
         <quote>Planet Venus</quote>, distributed in the Debian source
         package <literal>planet-venus</literal>:
-<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL>
+<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Planet Venus
 Upstream-Contact: John Doe <jdoe at example.com>
 Source: http://www.example.com/code/venus
@@ -1125,7 +1125,7 @@
 
 Files: debian/*
 Copyright: 2008, Dan Developer <dan at debian.example.com>
-License:
+License: permissive
  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