From: Russ Allbery <rra@debian.org>
Date: Sat, 3 Mar 2012 02:03:10 +0000 (-0800)
Subject: Fix copyright-format license to not reference copyright notice
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=f76c91cd6c979dadd1428d87791b0a5e0be706ea;p=debian%2Fdebian-policy.git

Fix copyright-format license to not reference copyright notice

* Fix the legal notice in copyright-format to not refer to a nonexistent
  copyright notice.
---

diff --git a/copyright-format/copyright-format-1.0.xml b/copyright-format/copyright-format-1.0.xml
index 277a4e0..afa0c02 100644
--- a/copyright-format/copyright-format-1.0.xml
+++ b/copyright-format/copyright-format-1.0.xml
@@ -14,8 +14,8 @@
     <legalnotice>
       <para>
         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.
+        are permitted in any medium without royalty provided this notice is
+        preserved.
       </para>
     </legalnotice>
     <abstract>
diff --git a/debian/changelog b/debian/changelog
index 911986f..566a8c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ debian-policy (3.9.3.1) UNRELEASED; urgency=low
   * Update the dpkg-buildpackage -r documentation in the appendix to
     reflect the current behavior of using fakeroot.  Wording from Sam
     Morris.  (Closes: #658009)
+  * Fix the legal notice in copyright-format to not refer to a nonexistent
+    copyright notice.
   * Install the HTML version of upgrading-checklist in the policy.html
     directory as upgrading-checklist.html so that it can be deployed on
     www.debian.org in a way that will allow links to Policy sections to