From: Bill Allombert <Bill.Allombert@math.u-bordeaux.fr>
Date: Thu, 20 May 2010 21:05:53 +0000 (+0200)
Subject: Replace 'copyright' by 'copyright information'.
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b969d45cf8ed776aaff71489c9f1619c91c2f4fd;p=debian%2Fdebian-policy.git

Replace 'copyright' by 'copyright information'.

Proposed by Jonathan Nieder.  Closes: #566220
---

diff --git a/debian/changelog b/debian/changelog
index 9afdef2..9af0f96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,13 +9,21 @@ debian-policy (3.8.4.1) UNRELEASED; urgency=low
     Closes: #567845
   * Fix typo in package_upstream-version.orig.tar.gz.
     Thanks, Salvatore Bonaccorso. (Closes: #558430)
+  * Replace 'copyright and distribution license' by 'copyright information
+    and distribution license' (three times).
+    Proposed by Jonathan Nieder.
+    Seconded:  Steve Langasek  <vorlon@debian.org>
+    Seconded:  Thijs Kinkhorst <thijs@debian.org>
+    Seconded:  Julien Cristau  <jcristau@debian.org>
+    Seconded:  Gregor Herrmann <gregoa@debian.org>
+    Closes: #566220
 
   [ Russ Allbery ]
   * Standardize dpkg state wording and bring it in line with dpkg,
     renaming Failed-Config to Half-Configured and use uniform
     capitalization and punctuation.  (Closes: #442134)
 
- -- Bill Allombert <ballombe@debian.org>  Fri, 21 May 2010 21:02:34 +0200
+ -- Bill Allombert <ballombe@debian.org>  Mon, 31 May 2010 20:00:28 +0200
 
 debian-policy (3.8.4.0) unstable; urgency=low
 
diff --git a/policy.sgml b/policy.sgml
index ab8fedf..d16df70 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -569,8 +569,8 @@
 	<heading>Copyright considerations</heading>
 
 	<p>
-	  Every package must be accompanied by a verbatim copy of
-	  its copyright and distribution license in the file
+	  Every package must be accompanied by a verbatim copy of its
+	  copyright information and distribution license in the file
 	  <file>/usr/share/doc/<var>package</var>/copyright</file>
 	  (see <ref id="copyrightfile"> for further details).
 	</p>
@@ -1638,8 +1638,8 @@
       <sect id="dpkgcopyright">
 	<heading>Copyright: <file>debian/copyright</file></heading>
         <p>
-          Every package must be accompanied by a verbatim copy of
-	  its copyright and distribution license in the file
+	  Every package must be accompanied by a verbatim copy of its
+	  copyright information and distribution license in the file
 	  <file>/usr/share/doc/<var>package</var>/copyright</file>
 	  (see <ref id="copyrightfile"> for further details). Also see
 	  <ref id="pkgcopyright"> for further considerations related
@@ -9108,7 +9108,7 @@ END-INFO-DIR-ENTRY
 
 	<p>
 	  Every package must be accompanied by a verbatim copy of its
-	  copyright and distribution license in the file
+	  copyright information and distribution license in the file
 	  <file>/usr/share/doc/<var>package</var>/copyright</file>. This
 	  file must neither be compressed nor be a symbolic link.
 	</p>