copyright-format: Fix syntax of examples.

Proposed by: Charles Plessy <plessy@debian.org>
Wording: Jonathan Nieder <jrnieder@gmail.com>
Closes: #649674

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index d03d4db01b785bb67981cd326bdd084e750b92b3..c9b556829e813ccf17a5c05cc5bc59314af0d82d 100644 (file)
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -488,7 +488,7 @@ License: GPL-2
  [LICENSE TEXT]
 
 License: LGPL-2.1
  [LICENSE TEXT]
 
 License: LGPL-2.1

- LICENSE TEXT]</programlisting>
+ [LICENSE TEXT]</programlisting>

       </example>
 
       <example>
       </example>
 
       <example>


@@ -1102,7 +1102,7 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: Copyright 1998 Jane Smith <jsmith@example.net>
 
 Files: debian/*
 Copyright: Copyright 1998 Jane Smith <jsmith@example.net>

-License:
+License: GPL-2+

  [LICENSE TEXT]]]></programlisting>
       </para>
     </example>
  [LICENSE TEXT]]]></programlisting>
       </para>
     </example>


@@ -1128,7 +1128,7 @@ License: PSF-2
 
 Files: debian/*
 Copyright: 2008, Dan Developer <dan@debian.example.com>
 
 Files: debian/*
 Copyright: 2008, Dan Developer <dan@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
  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

diff --git a/debian/changelog b/debian/changelog
index 8248d33273b0f92d68267f736f6891b6532749e5..3654b0b9178cb08accf2413b6194232c9a954297 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,6 +47,10 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Charles Plessy <plessy@debian.org>
     Seconded: Jakub Wilk <jwilk@debian.org>
     Closes: #640735
     Seconded: Charles Plessy <plessy@debian.org>
     Seconded: Jakub Wilk <jwilk@debian.org>
     Closes: #640735

+  * copyright-format: Fix syntax of examples.
+    Proposed by: Charles Plessy <plessy@debian.org>
+    Wording: Jonathan Nieder <jrnieder@gmail.com>
+    Closes: #649674

   * copyright-format: Clarify specification of multiple license exception:
     Wording: Steve Langasek <vorlon@debian.org>
     Seconded: Craig Small <csmall@debian.org>
   * copyright-format: Clarify specification of multiple license exception:
     Wording: Steve Langasek <vorlon@debian.org>
     Seconded: Craig Small <csmall@debian.org>