non-free and contrib packages should explain in copyright

Packages in the non-free and contrib categories should state in their
copyright files that the package is not part of the Debian GNU/Linux
distribution and briefly explain why.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-37

diff --git a/debian/changelog b/debian/changelog
index 106803ab6cb3bd01a3ba0dd24fd6b6b73189e71e..205438b2fe7f270ea9e6228a6787939eedc85a86 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ debian-policy (3.7.4.0) unstable; urgency=low
                                                              (Closes: #442070).
   * Bug fix: "Inclusion of Apache Software License versions in
     /usr/share/common-licenses", thanks to Barry Hawkins     (Closes: #291460).
+  * Bug fix: "[Amended] copyright should include notice if a package is
+    not a part of Debian distribution", thanks to Taketoshi Sano
+                                                             (Closes: #65577).
   * 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 ed8857615a80a8bdbdd0c587a3b20dc4372e6eae..c8087f3127483f1d5b3725747c022ef6d0ab672e 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -8816,7 +8816,14 @@ install-info --quiet --remove /usr/share/info/foobar.info
          In addition, the copyright file must say where the upstream
          sources (if any) were obtained.  It should name the original
          authors of the package and the Debian maintainer(s) who were
-         involved with its creation.</p>
+         involved with its creation.
+       </p>
+
+       <p>
+         Packages in the <em>contrib</em> or <em>non-free</em> categories
+         should state in the copyright file that the package is not part
+         of the Debian GNU/Linux distribution and briefly explain why.
+       </p>
 
        <p>
          A copy of the file which will be installed in

diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index 17382213bc3f2d558d1fb7c26af7bd2f502b13b8..be4c45f5570935da59d1ed8c6ef5beffca203164 100644 (file)
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -75,6 +75,9 @@ picking your way through this list.
        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]
+     * Packages in contrib and non-free should state in the copyright file
+       that the package is not part of Debian GNU/Linux and briefly
+       explain why.                                              [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]