[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#420701: GFDL is now in common-licenses



Simon Josefsson <simon@josefsson.org> writes:

> How about fixing the stylistic issue of saying 'For example, ..., and so
> on.'?  Actually, the filenames doesn't strike me as examples at all.
>
> How about 'In particular, /usr/..., respectively.' instead?  And make
> sure the paths are given in the same order as the text.
>
> Btw, the path to the LGPL v2.0 license is missing.

Here is a new patch that incorporates this change as well as the fix for
#431109.  If anyone has any objections, please raise them; otherwise, this
will go into the next release, since the current language is pretty
clearly broken and this is at least an improvement.

--- orig/policy.sgml
+++ mod/policy.sgml
@@ -8653,21 +8653,21 @@
 
 	<p>
 	  Packages distributed under the UCB BSD license, the Artistic
-	  license, the GNU GPL, and the GNU LGPL, should refer to the
-	  corresponding files under
+	  license, the GNU GPL (version 2 or 3), the GNU LGPL (versions
+	  2, 2.1, or 3), and the GNU FDL (version 1.2) should refer to
+	  the corresponding files under
 	  <file>/usr/share/common-licenses</file>,<footnote>
-            <p>
-              For example,
-              <file>/usr/share/common-licenses/Artistic</file>,
+	    <p>
+	      In particular,
               <file>/usr/share/common-licenses/BSD</file>,
-              <file>/usr/share/common-licenses/GPL</file>,
-              <file>/usr/share/common-licenses/LGPL</file>,
-              <file>/usr/share/common-licenses/GFDL</file>,
-              <file>/usr/share/common-licenses/GPL-2</file>, and
-              <file>/usr/share/common-licenses/LGPL-2.1</file>, and so
-              on. Note that the GFDL is new here, and the license file
-              may not yet be in place in
-              <file>/usr/share/common-licenses/GFDL</file>. 
+              <file>/usr/share/common-licenses/Artistic</file>,
+              <file>/usr/share/common-licenses/GPL-2</file>,
+              <file>/usr/share/common-licenses/GPL-3</file>,
+              <file>/usr/share/common-licenses/LGPL-2</file>,
+              <file>/usr/share/common-licenses/LGPL-2.1</file>,
+              <file>/usr/share/common-licenses/LGPL-3</file>, and
+              <file>/usr/share/common-licenses/GFDL-1.2</file>,
+              respectively.
             </p>
           </footnote> rather than quoting them in the copyright
 	  file. 

-- 
Russ Allbery (rra@debian.org)               <http://www.eyrie.org/~eagle/>




Reply to: