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

[plessy at users.alioth.debian.org]

Author: plessy
Date: Thu Feb  2 14:55:18 2012
New Revision: 259

URL: http://svn.debian.org/wsvn/dep/?sc=1&rev=259
Log:
Strenghten the disclaimers.

Closes: #658209

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=259&op=diff
==============================================================================
--- web/deps/dep5/copyright-format.xml (original)
+++ web/deps/dep5/copyright-format.xml Thu Feb  2 14:55:18 2012
@@ -42,8 +42,11 @@
       automatically extract licensing information.
     </para>
     <para>
-      This is not a proposal to change the policy in the short term.  In
-      particular, nothing in this proposal supersedes or modifies any of the
+      This specification is not part of the Debian Policy, and its use is
+      optional.
+    </para>
+    <para>
+      Nothing in this proposal supersedes or modifies any of the
       requirements specified in Debian Policy regarding the appropriate detail
       or granularity to use when documenting copyright and license status in
       <filename>debian/copyright</filename>.
@@ -262,8 +265,9 @@
       <para>
         The declaration of copyright and license for files is done in one or
         more paragraphs.  In the simplest case, a single paragraph can be used
-        which applies to all files and lists all applicable copyrights and
-        licenses.
+        which applies to the whole package.  Only the license and copyright
+        information required by the Debian archive is required to be listed
+        here.
       </para>
       <para>
         The following fields may be present in a Files paragraph.

Modified: web/deps/dep5/index.html
URL: http://svn.debian.org/wsvn/dep/web/deps/dep5/index.html?rev=259&op=diff
==============================================================================
--- web/deps/dep5/index.html (original)
+++ web/deps/dep5/index.html Thu Feb  2 14:55:18 2012
@@ -77,11 +77,13 @@
       its contents vary tremendously across packages, making it
       difficult to automatically extract licensing information.</p>
 
-      <p>This is not a proposal to change the policy in the short
-      term. In particular, nothing in this proposal supersedes or
-      modifies any of the requirements specified in Debian Policy
-      regarding the appropriate detail or granularity to use when
-      documenting copyright and license status in <tt class=
+      <p>This specification is not part of the Debian Policy, and
+      its use is optional.</p>
+
+      <p>Nothing in this proposal supersedes or modifies any of the
+      requirements specified in Debian Policy regarding the
+      appropriate detail or granularity to use when documenting
+      copyright and license status in <tt class=
       "filename">debian/copyright</tt>.</p>
     </div>
 
@@ -326,8 +328,10 @@
 
         <p>The declaration of copyright and license for files is
         done in one or more paragraphs. In the simplest case, a
-        single paragraph can be used which applies to all files and
-        lists all applicable copyrights and licenses.</p>
+        single paragraph can be used which applies to the whole
+        package. Only the license and copyright information
+        required by the Debian archive is required to be listed
+        here.</p>
 
         <p>The following fields may be present in a Files
         paragraph.</p>
@@ -412,7 +416,7 @@
         </ul>
 
         <div class="example">
-          <a name="AEN140" id="AEN140"></a>
+          <a name="AEN141" id="AEN141"></a>
 
           <p><b>Example 1. tri-licensed files</b></p>
           <pre class="programlisting">
@@ -433,7 +437,7 @@
         </div>
 
         <div class="example">
-          <a name="AEN143" id="AEN143"></a>
+          <a name="AEN144" id="AEN144"></a>
 
           <p><b>Example 2. recurrent license</b></p>
           <pre class="programlisting">
@@ -676,7 +680,7 @@
         </ul>
 
         <div class="informaltable">
-          <a name="AEN224" id="AEN224"></a>
+          <a name="AEN225" id="AEN225"></a>
 
           <table border="1" class="CALSTABLE">
             <col>
@@ -783,7 +787,7 @@
         "_top">SPDX Open Source License Registry</a>.</p>
 
         <div class="informaltable">
-          <a name="AEN269" id="AEN269"></a>
+          <a name="AEN270" id="AEN270"></a>
 
           <table border="1" class="CALSTABLE">
             <col>
@@ -1325,7 +1329,7 @@
       "examples">Examples</a></h2>
 
       <div class="example">
-        <a name="AEN498" id="AEN498"></a>
+        <a name="AEN499" id="AEN499"></a>
 
         <p><b>Example 3. Simple</b></p>
 
@@ -1370,7 +1374,7 @@
       </div>
 
       <div class="example">
-        <a name="AEN505" id="AEN505"></a>
+        <a name="AEN506" id="AEN506"></a>
 
         <p><b>Example 4. Complex</b></p>