r267 - in /web/deps/dep5: copyright-format.xml index.html

[plessy at users.alioth.debian.org]

Author: plessy
Date: Wed Feb  8 13:57:38 2012
New Revision: 267

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=267
Log:
Correct the example in line with the license list.

Modified:
    web/deps/dep5/copyright-format.xml
    web/deps/dep5/index.html

Modified: web/deps/dep5/copyright-format.xml
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/copyright-format.xml?rev=267&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Wed Feb  8 13:57:38 2012
@@ -1081,7 +1081,7 @@
         This is a dual-licensed GPL/Artistic work such as Perl:
 <programlisting>License: GPL-1+ or Artistic</programlisting>
         This is for a file that has both GPL and classic BSD code in it:
-<programlisting>License: GPL-2+ and BSD</programlisting>
+<programlisting>License: GPL-2+ and BSD-3-clause</programlisting>
         For the most complex cases, the comma is used to disambiguate the
         priority of <literal>or</literal>s and <literal>and</literal>s.
         <literal>and</literal> has the priority over <literal>or</literal>,
@@ -1096,7 +1096,7 @@
       </simpara>
       <para>
         This is for a file that has Perl code and classic BSD code in it:
-<programlisting>License: GPL-2+ or Artistic-2.0, and BSD</programlisting>
+<programlisting>License: GPL-2+ or Artistic-2.0, and BSD-3-clause</programlisting>
         A <literal>GPL-2+</literal> work with the <literal>OpenSSL</literal>
         exception is in effect a dual-licensed work that can be redistributed
         either under the <literal>GPL-2+</literal>, or under the

Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=267&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Wed Feb  8 13:57:38 2012
@@ -1244,7 +1244,7 @@
 </pre>This is for a file that has both GPL and classic BSD code in
 it:
         <pre class="programlisting">
-License: GPL-2+ and BSD
+License: GPL-2+ and BSD-3-clause
 </pre>For the most complex cases, the comma is used to disambiguate
 the priority of <tt class="literal">or</tt>s and <tt class=
 "literal">and</tt>s. <tt class="literal">and</tt> has the priority
@@ -1260,7 +1260,7 @@
         <p>This is for a file that has Perl code and classic BSD
         code in it:</p>
         <pre class="programlisting">
-License: GPL-2+ or Artistic-2.0, and BSD
+License: GPL-2+ or Artistic-2.0, and BSD-3-clause
 </pre>A <tt class="literal">GPL-2+</tt> work with the
         <tt class="literal">OpenSSL</tt> exception is in effect a
         dual-licensed work that can be redistributed either under