Le Mon, Nov 28, 2011 at 03:23:54PM +0000, Simon McVittie a écrit : > Some minor corrections for those patches: > > On Tue, 29 Nov 2011 at 00:01:17 +0900, Charles Plessy wrote: > > <section id="example-header-paragraph"> > > <title>Example header paragraph</title> > > -<programlisting>Format: <VERSIONED_FORMAT_URL> > > +<programlisting>Format: > > http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/; > > Upstream-Name: SOFTware > > Shouldn't have the trailing semicolon
URL patch updated, thanks ! -- Charles
>From 5a022476e4fd1896f497b9db0127fd0fe104242e Mon Sep 17 00:00:00 2001 From: Charles Plessy <ple...@debian.org> Date: Wed, 30 Nov 2011 23:47:36 +0900 Subject: [PATCH 3/5] copyright-format: URL on www.debian.org MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wording: Charles Plessy <ple...@debian.org> Seconded: David Prévot <taf...@debian.org> Seconded: gregor herrmann <gre...@debian.org> Closes: #640737 --- README.org | 2 +- copyright-format/copyright-format.xml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.org b/README.org index b2c4b6f..2be9c51 100644 --- a/README.org +++ b/README.org @@ -138,7 +138,7 @@ published at [[http://www.debian.org/doc/]]. In addition to the main technical manual, the team currently also maintains: -+ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0][Machine-readable debian/copyright format]] ++ [[http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/][Machine-readable debian/copyright format]] + [[http://www.debian.org/doc/packaging-manuals/menu-policy/][Debian Menu sub-policy]] + [[http://www.debian.org/doc/packaging-manuals/perl-policy/][Debian Perl Policy]] + [[http://www.debian.org/doc/packaging-manuals/mime-policy/][Debian MIME support sub-policy]] diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml index c9b5568..4c18c3b 100644 --- a/copyright-format/copyright-format.xml +++ b/copyright-format/copyright-format.xml @@ -185,7 +185,7 @@ <title><varname>Format</varname></title> <para> Required single line: URI of the format specification, such as: - <literal>http://www.debian.org/doc/copyright-format/1.0</literal> + <literal>http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</literal> </para> </section> @@ -278,7 +278,7 @@ <section id="example-header-paragraph"> <title>Example header paragraph</title> -<programlisting>Format: <VERSIONED_FORMAT_URL> +<programlisting>Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: SOFTware Upstream-Contact: John Doe <john....@example.com> Source: http://www.example.com/software/project</programlisting> @@ -1072,7 +1072,7 @@ also delete it here.</programlisting> A possible <filename>debian/copyright</filename> file for the program <quote>X Solitaire</quote> distributed in the Debian source package <literal>xsol</literal>: -<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL> +<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: X Solitaire Source: ftp://ftp.example.com/pub/games @@ -1113,7 +1113,7 @@ License: GPL-2+ A possible <filename>debian/copyright</filename> file for the program <quote>Planet Venus</quote>, distributed in the Debian source package <literal>planet-venus</literal>: -<programlisting><![CDATA[Format: <VERSIONED_FORMAT_URL> +<programlisting><![CDATA[Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Planet Venus Upstream-Contact: John Doe <j...@example.com> Source: http://www.example.com/code/venus -- 1.7.7.3