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

diff --git a/debian/changelog b/debian/changelog
index 2283ddddb1e6a30db8ace308bc81ad6f2bc15887..106803ab6cb3bd01a3ba0dd24fd6b6b73189e71e 100644 (file)
--- 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 d1be6228c462e5b80fe1f46c4fb77c97c2c0772d..ed8857615a80a8bdbdd0c587a3b20dc4372e6eae 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -8834,21 +8834,22 @@ install-info --quiet --remove /usr/share/info/foobar.info
        </p>
 
        <p>
-         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
-         <file>/usr/share/common-licenses</file>,<footnote>
+         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 <file>/usr/share/common-licenses</file>,<footnote>
            <p>
              In particular,
               <file>/usr/share/common-licenses/BSD</file>,
+              <file>/usr/share/common-licenses/Apache-2.0</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>,
+              <file>/usr/share/common-licenses/GFDL-1.2</file>
               respectively.
             </p>
           </footnote> rather than quoting them in the copyright

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 264e6a9f2cb11ed96bc425b4c4e75a6ca17b5c52..17382213bc3f2d558d1fb7c26af7bd2f502b13b8 100644 (file)
--- 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]