Bug#850646: [copyright-format] Allow https version of Format URI

[Mattia Rizzolo]

On Sun, Jan 08, 2017 at 12:02:38PM -0800, Russ Allbery wrote:
> Here's an updated patch that also fixes the other examples.

Thanks.

> diff --git a/copyright-format/copyright-format-1.0.xml 
> b/copyright-format/copyright-format-1.0.xml
> index 8b72e10..f33c5a2 100644
> --- a/copyright-format/copyright-format-1.0.xml
> +++ b/copyright-format/copyright-format-1.0.xml
> @@ -260,7 +260,7 @@
>  
>        <section id="example-header-paragraph">
>          <title>Example header paragraph</title>
> -<programlisting>Format: 
> http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
> +<programlisting>Format: 
> https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
>  Upstream-Name: SOFTware
>  Upstream-Contact: John Doe &lt;john....@example.com&gt;
>  Source: http://www.example.com/software/project</programlisting>
> @@ -414,7 +414,15 @@ License: MPL-1.1
>        <para>
>          Single-line: URI of the format specification.  The field that
>          should be used for the current version of this document is:
> +<programlisting>Format: 
> https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</programlisting>
> +      </para>
> +      <para>
> +        The original version of this specification used the non-https
> +        version of this URL as its URI, namely:
>  <programlisting>Format: 
> http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/</programlisting>
> +        Both versions are valid and refer to the same specification, and
> +        parsers should interpret both as referencing the same format.  The
> +        https URI is preferred.
>        </para>
>      </section>
>  
> @@ -1225,7 +1233,7 @@ also delete it here.</programlisting>
>          correct copyright file for the actual <literal>xsol</literal>
>          package):
>  <programlisting><![CDATA[
> -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
> +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
>  Upstream-Name: X Solitaire
>  Source: ftp://ftp.example.com/pub/games
>  
> @@ -1266,7 +1274,7 @@ License: GPL-2+
>          correct copyright file for the actual
>          <literal>planet-venus</literal> package):
>  <programlisting><![CDATA[
> -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
> +Format: https://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

Seconded.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

signature.asc
Description: PGP signature