Dear Policy team and WWW team,
Here are two patches against the debian-policy package, in order to prepare the
distribution of our specification of a machine-readable format for
debian/copyright, drafted as Debian Enhancement Proposal number 5 (DEP 5) at
the following URL:
http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
The first patch just catches up with changes sent by Lars as a driver, and the
second updates the URI to its final version. Proofreading is appreciated.
After the debian-policy package is updated in unstable, it will be possible to
bring the specification on line by adding a couple of commands to the
parts/7doc cron script of our website, like with the attached patch. Please
see it as an example only, and see also:
http://anonscm.debian.org/gitweb/?p=debwww/cron.git;a=blob;f=parts/7doc;h=4321c7ffaf32ce08294a9d198cf2d5b089fef0cd;hb=HEAD
Have a nice day,
--
Charles Plessy
Tsurumi, Kanagawa, Japan
>From 6a5eb1cff5a1e3c2499113ce4bc0a22cad14b4b8 Mon Sep 17 00:00:00 2001
From: Charles Plessy
Date: Tue, 6 Sep 2011 23:37:29 +0900
Subject: [PATCH 1/2] Patch from Lars Wirzenius that
* removes drivers from abstract (we're mentioned in acks, which is
enough)
* corrects a couple of missing spaces from markup
* removes of useless appendix (this was in dep svn already, so better do
it in the version in policy too)
http://bugs.debian.org/609160#109
---
copyright-format/copyright-format.xml | 31 +++
1 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index 8ae9023..d6790aa 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -30,9 +30,7 @@
standard, machine-readable format for
debian/copyright files within packages and
facilitate automated checking and reporting of licenses for packages and
-sets of packages. The DEP drivers were Steve Langasek
-vor...@debian.org and Lars Wirzenius
-l...@liw.fi.
+sets of packages.
@@ -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
-Filesfield has a list of filename patterns.
+Files field has a list of filename patterns.
@@ -273,7 +271,7 @@
package, for instance when a work combines a permissive and a copyleft
license, or to document a compilation copyright
and license. It is possible to use only License in
- the header paragraph, but Copyrightalone makes no
+ the header paragraph, but Copyright alone makes no
sense.
@@ -1171,27 +1169,4 @@ License: GPL-2+
-
-
- Appendix: Note about the use of this format in Debian
-
-
- The Debian Policy (§http://www.debian.org/doc/debian-policy/ch-docs#s-copyrightfile";>12.5)
- demands that each package is accompanied by a file,
- debian/copyright in source packages and
- /usr/share/doc/package/copyright 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.
-
-
- The copyright of the Debian packaging and the history of package
- maintainers is simply indicated in a Files: debian/*
- paragraph.
-
-
--
1.7.5.4
>From 36a2cc0fdf953cbaf6996fd63b51f427439e33e2 Mon Sep 17 00:00:00 2001
From: Charles Plessy
Date: Tue, 6 Sep 2011 23:43:43 +0900
Subject: [PATCH 2/2] Use
http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
as URI.
---
copyright-format/copyright-format.xml |8
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml
index d6790aa..2f9cb10 100644
--- a/copyright-format/copyright-format.xml
+++ b/copyright-format/copyright-format.xml
@@ -185,7 +185,7 @@
Format
Required single line: URI of the format specification, such as:
- http://www.debian.org/doc/copyright-format/1.0
+ http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
@@ -278,7 +278,7 @@
Example header paragraph
-Format:
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: SOFTware
Upstream-Contact: John Doe
