* copyright-format: remove drivers from abstract and useless appendix

    Wording: Lars Wirzenius <liw@liw.fi>
    Seconded: Charles Plessy <plessy@debian.org>
    Seconded: Jakub Wilk <jwilk@debian.org>
    Closes: #640735

diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 8ae90232f94e1dde1cd287364776fc6abefd906a..d6790aa3b85319f561586ba4a71b9770ae21ac73 100644 (file)
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -30,9 +30,7 @@
         standard, machine-readable format for
         <filename>debian/copyright</filename> files within packages and
         facilitate automated checking and reporting of licenses for packages and
-        sets of packages. The DEP drivers were Steve Langasek
-        <email>vorlon@debian.org</email> and Lars Wirzenius
-        <email>liw@liw.fi</email>.
+        sets of packages.
       </para>
     </abstract>
   </articleinfo>
@@ -143,7 +141,7 @@
         A white space separated list means that the field value may be on one
         line or many, but values in the list are separated by one or more white
         space characters (including space, TAB, and newline).  For example, the
-        <varname>Files</varname>field has a list of filename patterns.
+        <varname>Files</varname> field has a list of filename patterns.
       </para>
     </section>
 
@@ -273,7 +271,7 @@
           package, for instance when a work combines a permissive and a copyleft
           license, or to document a <emphasis>compilation copyright</emphasis>
           and license.  It is possible to use only <varname>License</varname> in
-          the header paragraph, but <varname>Copyright</varname>alone makes no
+          the header paragraph, but <varname>Copyright</varname> alone makes no
           sense.
         </para>
       </section>
@@ -1171,27 +1169,4 @@ License: GPL-2+
     </example>
   </section>
 
-  <section id="appendix">
-    <title>
-      Appendix: Note about the use of this format in Debian
-    </title>
-    <para>
-      The Debian Policy (§<ulink
-      url="http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile">12.5</ulink>)
-      demands that each package is accompanied by a file,
-      <filename>debian/copyright</filename> in source packages and
-      <filename>/usr/share/doc/package/copyright</filename> in binary packages,
-      that contains a verbatim copy of its copyright and distribution license.
-      In addition, it requires that copyrights must be extractable by mechanical
-      means.  This proposal for machine-readable copyright and license summary
-      files has been crafted for Debian's use, but it is our hope that other
-      software distributions, as well as upstream developers will adopt it, so
-      that review efforts can be easily reproduced and shared.
-    </para>
-    <para>
-      The copyright of the Debian packaging and the history of package
-      maintainers is simply indicated in a <literal>Files: debian/*</literal>
-      paragraph.
-    </para>
-  </section>
 </article>

diff --git a/debian/changelog b/debian/changelog
index a580f7f894abbc4594f354c4f38c0c2bd33f6316..2eb83dfeae1fcc97430437e90195a3e51b62ecfc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,11 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Bill Allombert <ballombe@debian.org>
     Seconded: Jakub Wilk <jwilk@debian.org>
     Closes: #617516
+  * copyright-format: remove drivers from abstract and useless appendix
+    Wording: Lars Wirzenius <liw@liw.fi>
+    Seconded: Charles Plessy <plessy@debian.org>
+    Seconded: Jakub Wilk <jwilk@debian.org>
+    Closes: #640735
   * Perl policy: Document major version upgrade trigger
     Wording: Dominic Hargreaves <dom@debian.org>
     Seconded: Russ Allbery <rra@debian.org>
@@ -42,7 +47,7 @@ debian-policy (3.9.3.0) UNRELEASED; urgency=low
     Seconded: Gregor Herrmann <gregoa@debian.org>
     Closes: #619275
 
- -- Bill Allombert <ballombe@debian.org>  Wed, 08 Jun 2011 23:01:20 +0200
+ -- Bill Allombert <ballombe@debian.org>  Thu, 08 Sep 2011 17:05:25 +0200
 
 debian-policy (3.9.2.0) unstable; urgency=low