Bug#641071: Please apply the following patches for copyright-format.xml.

[Charles Plessy <plessy@debian.org>]

Le Wed, Nov 30, 2011 at 11:59:20PM +0900, Charles Plessy a écrit :
> Le Mon, Nov 28, 2011 at 03:23:54PM +0000, 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=220&op=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