From 50275e929f3d19d9ffed940d72e900f1bcd44dae Mon Sep 17 00:00:00 2001 From: Russ Allbery Date: Sun, 16 Mar 2008 19:36:33 +0000 Subject: [PATCH] Add Apache 2.0 to common-licenses Add Apache 2.0 to the list of licenses that are in common-licenses and should be referenced rather than included in debian/copyright. git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-36 --- debian/changelog | 2 ++ policy.sgml | 13 +++++++------ upgrading-checklist.html | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2283ddd..106803a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,8 @@ debian-policy (3.7.4.0) unstable; urgency=low * Bug fix: "Policy inconsistent with reality: base subsection no longer used", thanks to Magnus Holmgren, Bernd Zeimetz, and Colin Watson (Closes: #442070). + * Bug fix: "Inclusion of Apache Software License versions in + /usr/share/common-licenses", thanks to Barry Hawkins (Closes: #291460). * Bug fix: "Examples of dpkg frontends should mention apt now", thanks to Josh Triplett (Closes: #455602). * Bug fix: "Minor typos and wording suggestions", thanks to Michael diff --git a/policy.sgml b/policy.sgml index d1be622..ed88576 100644 --- a/policy.sgml +++ b/policy.sgml @@ -8834,21 +8834,22 @@ install-info --quiet --remove /usr/share/info/foobar.info

- Packages distributed under the UCB BSD license, 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 files under - /usr/share/common-licenses, + 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 + files under /usr/share/common-licenses,

In particular, /usr/share/common-licenses/BSD, + /usr/share/common-licenses/Apache-2.0, /usr/share/common-licenses/Artistic, /usr/share/common-licenses/GPL-2, /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/GFDL-1.2 respectively.

rather than quoting them in the copyright diff --git a/upgrading-checklist.html b/upgrading-checklist.html index 264e6a9..1738221 100644 --- a/upgrading-checklist.html +++ b/upgrading-checklist.html @@ -73,6 +73,8 @@ picking your way through this list. characters in the manual page source should be representable in the legacy encoding for a locale even if the man page is encoded in UTF-8. [12.1] + * The Apache 2.0 license is now in common-licenses and should be + referenced rather than quoted in debian/copyright. [12.5] 3.7.3.0 Dec 2007 * Package version numbers may contain tildes, which sort before anything, even the end of a part. [5.6.12] -- 2.39.5