From: Russ Allbery <rra@debian.org>
Date: Tue, 29 Jun 2010 17:06:28 +0000 (-0700)
Subject: Include GPL version 1 in common-licenses
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=521254f7c66fe468538e1cd8359f2f5f5689f459;hp=a70976a91f595c5451ca2a6a4b046f4ec6d45b33;p=debian%2Fdebian-policy.git

Include GPL version 1 in common-licenses

Closes Bug#436105.
---

diff --git a/debian/changelog b/debian/changelog
index 880a3c5..ce27639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,11 @@
-debian-policy (3.9.0.1) UNRELEASED; urgency=low
+debian-policy (3.9.1.0) UNRELEASED; urgency=low
 
+  * Policy: Include GPL version 1 in common-licenses
+    Wording: Russ Allbery <rra@debian.org>
+    Seconded: gregor herrmann <gregoa@debian.org>
+    Seconded: Damyan Ivanov <dmn@debian.org>
+    Seconded: Giacomo A. Catenazzi <cate@debian.org>
+    Closes: #436105
   * Set the version of the Perl Policy to match the version of the Policy
     package.
   * Explain the Perl module package naming policy more explicitly and
diff --git a/policy.sgml b/policy.sgml
index abb1a8e..3e99099 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -9407,14 +9407,15 @@ END-INFO-DIR-ENTRY
 
 	<p>
 	  Packages distributed under the Apache license (version 2.0), the
-	  Artistic license, the GNU GPL (version 2 or 3), the GNU LGPL
-	  (versions 2, 2.1, or 3), and the GNU FDL (versions 1.2 or 1.3)
-	  should refer to the corresponding files
+	  Artistic license, the GNU GPL (versions 1, 2, or 3), the GNU
+	  LGPL (versions 2, 2.1, or 3), and the GNU FDL (versions 1.2 or
+	  1.3) should refer to the corresponding files
 	  under <file>/usr/share/common-licenses</file>,<footnote>
 	    <p>
 	      In particular,
               <file>/usr/share/common-licenses/Apache-2.0</file>,
               <file>/usr/share/common-licenses/Artistic</file>,
+              <file>/usr/share/common-licenses/GPL-1</file>,
               <file>/usr/share/common-licenses/GPL-2</file>,
               <file>/usr/share/common-licenses/GPL-3</file>,
               <file>/usr/share/common-licenses/LGPL-2</file>,
diff --git a/upgrading-checklist.sgml b/upgrading-checklist.sgml
index 931ce27..fabc1cb 100644
--- a/upgrading-checklist.sgml
+++ b/upgrading-checklist.sgml
@@ -34,6 +34,19 @@ picking your way through this list.
 
 <chapt> The checklist
 
+<sect> Version 3.9.1.0
+<p>
+
+Not yet released.
+
+</p><p><taglist>
+<tag>12.5</tag>
+  <item>The GPL version 1 is now included in common-licenses and should be
+  referenced from there instead of included in the <file>copyright</file>
+  file.
+  </item>
+</taglist></p>
+
 <sect> Version 3.9.0.0
 <p>