Bug#641071: Please apply the following patches for copyright-format.xml.
Le Wed, Nov 30, 2011 at 11:59:20PM +0900, Charles Plessy a écrit : Le Mon, Nov 28, 2011 at 03:23:54PM +, Simon McVittie a écrit : Some minor corrections for those patches: -Creative Commons ulink -url=http://creativecommons.org/license/zero/;Universal -waiver/ulink. +Creative Common Universal +ulink url=http://spdx.org/licenses/CC0-1.0;1.0/ulink. It's called Creative Commons Zero 1.0 Universal, not Creative Common Universal 1.0 entry -ulink url=http://spdx.org/licenses/CDDL;Common Development +ulink url=http://spdx.org/licenses/CDDL-1.0;Common Development and Distribution License/ulink. Shouldn't this say ...License 1.0/ulink, consistent with the SPDX page's name? SPDX patch updated, thanks ! Dear Bill, Steve found an error in the patch I sent. Sorry for the mess. Modified: web/deps/dep5/copyright-format.xml URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=220op=diff == --- web/deps/dep5/copyright-format.xml (original) +++ web/deps/dep5/copyright-format.xml Thu Dec 1 00:45:08 2011 @@ -707,8 +707,8 @@ CC0 /entry entry -Creative Commons Zero 1.0 Universal -ulink url=http://spdx.org/licenses/CC0-1.0;1.0/ulink. +Creative Commons Zero +ulink url=http://spdx.org/licenses/CC0-1.0;1.0 Universal/ulink. /entry /row row Cheers, -- Charles -- To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20111202015026.ga3...@merveille.plessy.net
Bug#640737: Please apply the following patches for copyright-format.xml.
Le Mon, Nov 28, 2011 at 03:23:54PM +, 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 titleExample header paragraph/title -programlistingFormat: lt;VERSIONED_FORMAT_URLgt; +programlistingFormat: 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 @@ titlevarnameFormat/varname/title para Required single line: URI of the format specification, such as: - literalhttp://www.debian.org/doc/copyright-format/1.0/literal + literalhttp://www.debian.org/doc/packaging-manuals/copyright-format/1.0//literal /para /section @@ -278,7 +278,7 @@ section id=example-header-paragraph titleExample header paragraph/title -programlistingFormat: lt;VERSIONED_FORMAT_URLgt; +programlistingFormat: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: SOFTware Upstream-Contact: John Doe lt;john@example.comgt; Source: http://www.example.com/software/project/programlisting @@ -1072,7 +1072,7 @@ also delete it here./programlisting A possible filenamedebian/copyright/filename file for the program quoteX Solitaire/quote distributed in the Debian source package literalxsol/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 filenamedebian/copyright/filename file for the program quotePlanet Venus/quote, distributed in the Debian source package literalplanet-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
Bug#641071: Please apply the following patches for copyright-format.xml.
Le Mon, Nov 28, 2011 at 03:23:54PM +, Simon McVittie a écrit : Some minor corrections for those patches: -Creative Commons ulink -url=http://creativecommons.org/license/zero/;Universal -waiver/ulink. +Creative Common Universal +ulink url=http://spdx.org/licenses/CC0-1.0;1.0/ulink. It's called Creative Commons Zero 1.0 Universal, not Creative Common Universal 1.0 entry -ulink url=http://spdx.org/licenses/CDDL;Common Development +ulink url=http://spdx.org/licenses/CDDL-1.0;Common Development and Distribution License/ulink. Shouldn't this say ...License 1.0/ulink, consistent with the SPDX page's name? SPDX patch updated, thanks ! -- Charles From 5c6fb914e68625fbec8f413bbee7dcd707e80c59 Mon Sep 17 00:00:00 2001 From: Charles Plessy ple...@debian.org Date: Wed, 30 Nov 2011 23:52:28 +0900 Subject: [PATCH 4/5] copyright-format: correct or add links to SPDX. Wording: Charles Plessy ple...@debian.org Seconded: gregor herrmann gre...@debian.org Closes: #641071 --- copyright-format/copyright-format.xml | 29 ++--- 1 files changed, 14 insertions(+), 15 deletions(-) diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml index 4c18c3b..e854c2a 100644 --- a/copyright-format/copyright-format.xml +++ b/copyright-format/copyright-format.xml @@ -580,8 +580,8 @@ License: MPL-1.1 /entry entry Apache license -ulink url=http://spdx.org/licenses/ASL-1.0;1.0/ulink, -ulink url=http://spdx.org/licenses/ASL-2.0;2.0/ulink. +ulink url=http://spdx.org/licenses/Apache-1.0;1.0/ulink, +ulink url=http://spdx.org/licenses/Apache-2.0;2.0/ulink. /entry /row row @@ -710,9 +710,8 @@ License: MPL-1.1 CC0 /entry entry -Creative Commons ulink -url=http://creativecommons.org/license/zero/;Universal -waiver/ulink. +Creative Commons Zero 1.0 Universal +ulink url=http://spdx.org/licenses/CC0-1.0;1.0/ulink. /entry /row row @@ -720,8 +719,8 @@ License: MPL-1.1 CDDL /entry entry -ulink url=http://spdx.org/licenses/CDDL;Common Development -and Distribution License/ulink. +Common Development and Distribution License +ulink url=http://spdx.org/licenses/CDDL-1.0;1.0/ulink. /entry /row row @@ -772,7 +771,6 @@ License: MPL-1.1 ulink url=http://spdx.org/licenses/LGPL-2.1;2.1/ulink, ulink url=http://spdx.org/licenses/LGPL-3.0;3.0/ulink, or GNU Library General Public License -ulink url=http://spdx.org/licenses/LGPL-1.0;1.0/ulink, ulink url=http://spdx.org/licenses/LGPL-2.0;2.0/ulink. /entry /row @@ -781,8 +779,8 @@ License: MPL-1.1 GFDL /entry entry -ulink url=http://spdx.org/licenses/FDL-1.0;GNU Free -Documentation License/ulink. +GNU Free Documentation License 1.0, or +ulink url=http://spdx.org/licenses/GFDL-1.1;1.1/ulink. /entry /row row @@ -827,12 +825,13 @@ License: MPL-1.1 /row row entry -Python-CNRI +Python /entry entry -ulink url=http://spdx.org/licenses/Python-CNRI;Python -license/ulink. +Python license +ulink url=http://spdx.org/licenses/Python-2.0;2.0/ulink. /entry + !-- See https://fossbazaar.org/pipermail/spdx-legal/2011-February/10.html -- /row row entry @@ -869,8 +868,8 @@ License: MPL-1.1 Zope /entry entry -Zope Public License - ulink url=http://spdx.org/licenses/ZPL-1.0;1.0/ulink, +Zope Public License 1.0, + ulink url=http://spdx.org/licenses/ZPL-1.1;1.1/ulink, ulink url=http://spdx.org/licenses/ZPL-2.0;2.0/ulink, ulink url=http://spdx.org/licenses/ZPL-2.1;2.1/ulink. /entry -- 1.7.7.3
Re: Please apply the following patches for copyright-format.xml.
On Tue, Nov 29, 2011 at 12:01:17AM +0900, Charles Plessy wrote: user debian-pol...@packages.debian.org usertags 649674 informative tag 649674 patch usertags 649679 normative issue thanks Le Mon, Nov 28, 2011 at 12:26:33PM +0100, Bill Allombert a écrit : As I said previously, my plan was to upload 3.9.3 as soon as the DEP issues are resolved. Unfortunately the DEP-related issues are becoming confusing. Thanks for the clarification. I am sorry for the mess around the DEP. I know I share the responsability for it. But let's take an optimistic point of view: there are no major blocker reported, and the recent resolution of #633797 shows that we can cooperate and converge on a consensus when tackling new issues. So I would like to propose to apply the following patches, and after this to call for either reporting new issues or declaring the DEP accepted. Correction of the examples http://bugs.debian.org/649674 This is a patch that bring the examples in compliance with the DEP, by correcting one typo and adding two missing license short names. Making the examples more informative would be a plus, but unless Steve directly supports this I would propose to not touch them further. Specification of “with keywords exception”. http://bugs.debian.org/633797 This is a normative change that has a very broad consensus, that limits the use of license exceptions to one keyword, and only for granting additional permissions. I have updated the patch to fully reflect Steve's changes (including the commit message). URL is http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ http://bugs.debian.org/640737 Consensus is reached and David from the WWW team started to work on installing the documents on www.debian.org at this URL. Correction of Python license name and SPDX URLs. http://bugs.debian.org/641071 The SPDX website is back ! URL corrections are not normative, and correction of Python license name was agreed earlier. I have applied all these patches. Cheers, -- Bill. ballo...@debian.org Imagine a large red swirl here. -- To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/2030222413.GG24303@yellowpig
Please apply the following patches for copyright-format.xml.
user debian-pol...@packages.debian.org usertags 649674 informative tag 649674 patch usertags 649679 normative issue thanks Le Mon, Nov 28, 2011 at 12:26:33PM +0100, Bill Allombert a écrit : As I said previously, my plan was to upload 3.9.3 as soon as the DEP issues are resolved. Unfortunately the DEP-related issues are becoming confusing. Thanks for the clarification. I am sorry for the mess around the DEP. I know I share the responsability for it. But let's take an optimistic point of view: there are no major blocker reported, and the recent resolution of #633797 shows that we can cooperate and converge on a consensus when tackling new issues. So I would like to propose to apply the following patches, and after this to call for either reporting new issues or declaring the DEP accepted. Correction of the examples http://bugs.debian.org/649674 This is a patch that bring the examples in compliance with the DEP, by correcting one typo and adding two missing license short names. Making the examples more informative would be a plus, but unless Steve directly supports this I would propose to not touch them further. Specification of “with keywords exception”. http://bugs.debian.org/633797 This is a normative change that has a very broad consensus, that limits the use of license exceptions to one keyword, and only for granting additional permissions. I have updated the patch to fully reflect Steve's changes (including the commit message). URL is http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ http://bugs.debian.org/640737 Consensus is reached and David from the WWW team started to work on installing the documents on www.debian.org at this URL. Correction of Python license name and SPDX URLs. http://bugs.debian.org/641071 The SPDX website is back ! URL corrections are not normative, and correction of Python license name was agreed earlier. English proofreading. http://bugs.debian.org/648387 This patch had mostly positive opinions. Steve questionned the timing and noted “arbitrary preferences of word choice”. I think that it is unavoidable, and that following choices coming from debian-l10n-english gives us chances that they are consistent with other texts in Debian. I needed to lift this patch in order to apply it, and took the opportunity to correct trivial typos, and to update it to Justins' proposed addition at http://lists.debian.org/2011120524.ga13...@xibalba.demon.co.uk For your convenience if you like, I have attached the patches to this email in the git-format-patch format. I will update #633797 and #648387 shortly. The issue left open are: Clarify what distinguishes files and stand-alone license paragraphs http://bugs.debian.org/649679 This would indeed clarify the syntax but the problem is a corner case, so I would tend to avoid to make a normative change at that moment. Clearer definitions and more consistent License: stanza specification http://bugs.debian.org/649530 The current version of the DEP is indeed vague on that topic as it allows to have different contents in License fields that have the same short name. But at this stage I find it rather a convenience than a problem. I think that further work on that side is more in the scope of a next version of the spec. Reporting new issues is still very welcome. But my personal point of view is that if no precise objections are raised by the next weeks, then it means that the version 1.0 of the DEP is ready. I understand that it is in direct contradiction with Steve's position, and I do not seek confrontation for the sake of it. He wrote that there are real problems and that it is nearly impossible for implementors to get things right. I think that the existence of parsers in Lintian and config-model attenuate this point of view, but I do not negate the possibility of problems. The sooner they are explained, the sooner we will finish our work. Have a nice day, -- Charles Plessy Tsurumi, Kanagawa, Japan From f001eee7e8a9adf0ebf995477185ec7022626afa Mon Sep 17 00:00:00 2001 From: Charles Plessy ple...@debian.org Date: Mon, 28 Nov 2011 22:27:56 +0900 Subject: [PATCH 1/5] copyright-format: syntax correction of examples. Wording: Jonathan Nieder jrnie...@gmail.com Closes: #649674 --- copyright-format/copyright-format.xml |6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/copyright-format/copyright-format.xml b/copyright-format/copyright-format.xml index d6790aa..1cf1acf 100644 --- a/copyright-format/copyright-format.xml +++ b/copyright-format/copyright-format.xml @@ -488,7 +488,7 @@ License: GPL-2 [LICENSE TEXT] License: LGPL-2.1 - LICENSE TEXT]/programlisting + [LICENSE TEXT]/programlisting /example example @@ -1090,7 +1090,7 @@ License: GPL-2+ Files: debian/* Copyright: Copyright 1998 Jane Smith jsm...@example.net -License: +License: GPL-2+ [LICENSE
Processed: Please apply the following patches for copyright-format.xml.
Processing commands for cont...@bugs.debian.org: user debian-pol...@packages.debian.org Setting user to debian-pol...@packages.debian.org (was ple...@debian.org). usertags 649674 informative Bug#649674: [copyright-format] Proofreading of the examples. There were no usertags set. Usertags are now: informative. tag 649674 patch Bug #649674 [debian-policy] [copyright-format] Proofreading of the examples. Added tag(s) patch. usertags 649679 normative issue Bug#649679: [copyright-format] Clarify what distinguishes files and stand-alone license paragraphs. There were no usertags set. Usertags are now: normative issue. thanks Stopping processing here. Please contact me if you need assistance. -- 649679: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649679 649674: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=649674 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems -- To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/handler.s.c.132249249013319.transcr...@bugs.debian.org
Re: Please apply the following patches for copyright-format.xml.
Some minor corrections for those patches: On Tue, 29 Nov 2011 at 00:01:17 +0900, Charles Plessy wrote: section id=example-header-paragraph titleExample header paragraph/title -programlistingFormat: lt;VERSIONED_FORMAT_URLgt; +programlistingFormat: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/; Upstream-Name: SOFTware Shouldn't have the trailing semicolon -Creative Commons ulink -url=http://creativecommons.org/license/zero/;Universal -waiver/ulink. +Creative Common Universal +ulink url=http://spdx.org/licenses/CC0-1.0;1.0/ulink. It's called Creative Commons Zero 1.0 Universal, not Creative Common Universal 1.0 entry -ulink url=http://spdx.org/licenses/CDDL;Common Development +ulink url=http://spdx.org/licenses/CDDL-1.0;Common Development and Distribution License/ulink. Shouldn't this say ...License 1.0/ulink, consistent with the SPDX page's name? Regards, S -- To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/2028152354.ga28...@reptile.pseudorandom.co.uk
Re: Please apply the following patches for copyright-format.xml.
On Tue, Nov 29, 2011 at 12:01:17AM +0900, Charles Plessy wrote: user debian-pol...@packages.debian.org usertags 649674 informative tag 649674 patch usertags 649679 normative issue thanks Le Mon, Nov 28, 2011 at 12:26:33PM +0100, Bill Allombert a écrit : As I said previously, my plan was to upload 3.9.3 as soon as the DEP issues are resolved. Unfortunately the DEP-related issues are becoming confusing. Thanks for the clarification. I am sorry for the mess around the DEP. I know I share the responsability for it. But let's take an optimistic point of view: there are no major blocker reported, and the recent resolution of #633797 shows that we can cooperate and converge on a consensus when tackling new issues. So I would like to propose to apply the following patches, and after this to call for either reporting new issues or declaring the DEP accepted. As I understand, Steve maintains a VCS repository for DEP5 already. How can we improve the synergy ? Having two repositories for the same document might lead to confusion. Cheers, -- Bill. ballo...@debian.org Imagine a large red swirl here. -- To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/2028211736.GH26059@yellowpig
Re: Please apply the following patches for copyright-format.xml.
Le Mon, Nov 28, 2011 at 10:17:36PM +0100, Bill Allombert a écrit : On Tue, Nov 29, 2011 at 12:01:17AM +0900, Charles Plessy wrote: I would like to propose to apply the following patches, and after this to call for either reporting new issues or declaring the DEP accepted. As I understand, Steve maintains a VCS repository for DEP5 already. How can we improve the synergy ? Having two repositories for the same document might lead to confusion. Currently, http://dep.debian.net/deps/dep5/ contains a HTML version of the DEP that reflects the DocBook version in the debian-policy package. I plan to continue synchronising them. I think that it is better to show the document that will be published on line, markup included, and that is why I replaced the markdown version by plain HTML. If Steve wants to modify directly the HTML version as he did for #633797, it is not a problem for me. I will continue to port his changes to DocBook. Have a nice day, -- Charles Plessy Tsurumi, Kanagawa, Japan -- To UNSUBSCRIBE, email to debian-policy-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/2028231727.gc12...@merveille.plessy.net
