From eb74474f199703ba519487fdccd4c27e5e196253 Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Fri, 20 Mar 2009 14:50:51 -0700 Subject: [PATCH] Add GFDL 1.3 to the common-licenses list --- debian/changelog | 4 +++- policy.sgml | 9 +++++---- upgrading-checklist.html | 5 +++++ 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index a4eb35f..159cb95 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ -debian-policy (3.8.1.1) UNRELEASED; urgency=low +debian-policy (3.8.2.0) UNRELEASED; urgency=low + * Housekeeping (resynchronizing lists maintained elsewhere): + - Add GFDL 1.3 to the common-licenses list. * Set the release date of the 3.8.1 upgrading-checklist entry. (Closes: #519706) diff --git a/policy.sgml b/policy.sgml index 8f02c12..d034be9 100644 --- a/policy.sgml +++ b/policy.sgml @@ -9047,8 +9047,8 @@ install-info --quiet --remove /usr/share/info/foobar.info

Packages distributed under the UCB BSD license, 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 (version 1.2) should refer to the corresponding + (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 under /usr/share/common-licenses,

In particular, @@ -9059,8 +9059,9 @@ install-info --quiet --remove /usr/share/info/foobar.info /usr/share/common-licenses/GPL-3, /usr/share/common-licenses/LGPL-2, /usr/share/common-licenses/LGPL-2.1, - /usr/share/common-licenses/LGPL-3, and - /usr/share/common-licenses/GFDL-1.2 + /usr/share/common-licenses/LGPL-3, + /usr/share/common-licenses/GFDL-1.2, and + /usr/share/common-licenses/GFDL-1.3 respectively.

rather than quoting them in the copyright diff --git a/upgrading-checklist.html b/upgrading-checklist.html index 1319990..45fa093 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -41,6 +41,11 @@ picking your way through this list.

The checklist

+3.8.2.0                        unreleased
+
+     * The GNU Free Documentation License version 1.3 is included in
+       common-licenses and should be referenced from there.      [12.5]
+
 3.8.1.0                        Mar 2009
 
      * Care should be taken when adding functionality to essential and
-- 
2.39.5