From 285b528d7ca25e8f256e86af9650fe14a9eb6847 Mon Sep 17 00:00:00 2001
From: Russ Allbery <rra@debian.org>
Date: Mon, 3 Dec 2007 02:52:44 +0000
Subject: [PATCH] Update the common-licenses list

Update the list of licenses in /usr/share/common-licenses to mention
specific version numbers, include GFDL 1.2, and include GPL 3 and
LGPL 3.  List all of the specific file names in the footnote rather
than only giving examples.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-18
---
 debian/changelog         |  2 ++
 policy.sgml              | 26 +++++++++++++-------------
 upgrading-checklist.html |  2 ++
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3a6bccc..0a6b04a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,6 +30,8 @@ debian-policy (3.7.3.0) UNRELEASED; urgency=low
     files", thanks to Franz Pop and Raphaël Hertzog          (Closes: #363133).
   * Bug fix: "Introduce a requirement for internationalisation of debconf
     templates", thanks to Christian Perrier                  (Closes: #402975).
+  * Bug fix: "GFDL is now in common-licenses".  Also add the rest of the
+    specific license versions and the GPLv3                  (Closes: #420701).
   * Remove inactive uploaders and add Russ Allbery.
   
  --
diff --git a/policy.sgml b/policy.sgml
index 2e8fdd1..a71358d 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -8696,21 +8696,21 @@ install-info --quiet --remove /usr/share/info/foobar.info
 
 	<p>
 	  Packages distributed under the UCB BSD license, the Artistic
-	  license, the GNU GPL, and the GNU LGPL, should refer to the
-	  corresponding files under
+	  license, the GNU GPL (version 2 or 3), the GNU LGPL (versions
+	  2, 2.1, or 3), and the GNU FDL (version 1.2) should refer to
+	  the corresponding files under
 	  <file>/usr/share/common-licenses</file>,<footnote>
-            <p>
-              For example,
-              <file>/usr/share/common-licenses/Artistic</file>,
+	    <p>
+	      In particular,
               <file>/usr/share/common-licenses/BSD</file>,
-              <file>/usr/share/common-licenses/GPL</file>,
-              <file>/usr/share/common-licenses/LGPL</file>,
-              <file>/usr/share/common-licenses/GFDL</file>,
-              <file>/usr/share/common-licenses/GPL-2</file>, and
-              <file>/usr/share/common-licenses/LGPL-2.1</file>, and so
-              on. Note that the GFDL is new here, and the license file
-              may not yet be in place in
-              <file>/usr/share/common-licenses/GFDL</file>. 
+              <file>/usr/share/common-licenses/Artistic</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>,
+              <file>/usr/share/common-licenses/LGPL-2.1</file>,
+              <file>/usr/share/common-licenses/LGPL-3</file>, and
+              <file>/usr/share/common-licenses/GFDL-1.2</file>,
+              respectively.
             </p>
           </footnote> rather than quoting them in the copyright
 	  file. 
diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index f66adf3..1c9e836 100644
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -77,6 +77,8 @@ picking your way through this list.
      * Packages following the Debian Configuration management
        specification must allow for translation of their messages by using
        a gettext-based system such as po-debconf.                [3.9.1]
+     * GFDL 1.2, GPL 3, and LGPL 3 are now in common-licenses and should
+       be referenced rather than quoted in debian/copyright.     [12.5]
 3.7.2.2                        Oct 2006
      * Maintainer scripts must not be world writeable (up from a
        should to a must)                                         [6.1]
-- 
2.39.5