From: Bill Allombert <Bill.Allombert@math.u-bordeaux1.fr>
Date: Tue, 29 Nov 2011 23:39:39 +0000 (+0100)
Subject: copyright-format: Fix syntax of examples.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=484e03bf96ab2d3f13f0804fc57d665a7b316511;p=debian%2Fdebian-policy.git

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 d03d4db..c9b5568 100644
--- 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]</programlisting>
+ [LICENSE TEXT]</programlisting>
       </example>
 
       <example>
@@ -1102,7 +1102,7 @@ License: GPL-2+
 
 Files: debian/*
 Copyright: Copyright 1998 Jane Smith <jsmith@example.net>
-License:
+License: GPL-2+
  [LICENSE TEXT]]]></programlisting>
       </para>
     </example>
@@ -1128,7 +1128,7 @@ License: PSF-2
 
 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
diff --git a/debian/changelog b/debian/changelog
index 8248d33..3654b0b 100644
--- 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
+  * 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>