Bug#420701: GFDL is now in common-licenses

2007-11-29 Thread Russ Allbery
Simon Josefsson [EMAIL PROTECTED] 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 ([EMAIL PROTECTED])   http://www.eyrie.org/~eagle/



-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#420701: GFDL is now in common-licenses

2007-07-06 Thread Simon Josefsson
Russ Allbery [EMAIL PROTECTED] writes:

 Giacomo A Catenazzi [EMAIL PROTECTED] writes:

 I think we should add also the license version in the first paragraph,
 as is stated in the second part, not to confuse users.

 +  license, the GNU GPL (v. 2), the GNU LGPL (v. 2 and v. 2.1), and
 the GNU FDL should refer
 +  to the corresponding files under

 Agreed.  Here's a new patch.  Note that this removes the unversioned
 licenses from the non-normative footnote; that's not a normative change
 yet, but I do want to discuss that separately under Bug#431109.

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.

Thanks,
Simon

 --- orig/policy.sgml
 +++ mod/policy.sgml
 @@ -8653,21 +8653,18 @@
  
   p
 Packages distributed under the UCB BSD license, the Artistic
 -   license, the GNU GPL, and the GNU LGPL, should refer to the
 +   license, the GNU GPL (version 2), the GNU LGPL (versions 2 and
 +   2.1), 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,
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/GPL-2/file,
 +  file/usr/share/common-licenses/LGPL-2.1/file,
 +  file/usr/share/common-licenses/GFDL-1.2/file, and so
 +  on.
  /p
/footnote rather than quoting them in the copyright
 file. 

 -- 
 Russ Allbery ([EMAIL PROTECTED])   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#420701: GFDL is now in common-licenses

2007-07-04 Thread Russ Allbery
Here is a proposed wording patch.  Unless there are any objections, I'll
commit this to my repository.

--- orig/policy.sgml
+++ mod/policy.sgml
@@ -8653,8 +8653,8 @@
 
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, the GNU LGPL, and the GNU FDL should refer
+ to the corresponding files under
  file/usr/share/common-licenses/file,footnote
 p
   For example,
@@ -8665,9 +8665,7 @@
   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. 
+  on.
 /p
   /footnote rather than quoting them in the copyright
  file. 

-- 
Russ Allbery ([EMAIL PROTECTED])   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#420701: GFDL is now in common-licenses

2007-07-04 Thread Giacomo A. Catenazzi

Russ Allbery wrote:

Here is a proposed wording patch.  Unless there are any objections, I'll
commit this to my repository.

--- orig/policy.sgml
+++ mod/policy.sgml
@@ -8653,8 +8653,8 @@
 
 	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, the GNU LGPL, and the GNU FDL should refer
+ to the corresponding files under
  file/usr/share/common-licenses/file,footnote
 p
   For example,



@@ -8665,9 +8665,7 @@
   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. 
+  on.

 /p
   /footnote rather than quoting them in the copyright
 	  file. 



I think we should add also the license version in the first paragraph,
as is stated in the second part, not to confuse users.

+	  license, the GNU GPL (v. 2), the GNU LGPL (v. 2 and v. 2.1), and the 
GNU FDL should refer

+ to the corresponding files under

ciao
cate


--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]



Bug#420701: GFDL is now in common-licenses

2007-07-04 Thread Russ Allbery
Giacomo A Catenazzi [EMAIL PROTECTED] writes:

 I think we should add also the license version in the first paragraph,
 as is stated in the second part, not to confuse users.

 +   license, the GNU GPL (v. 2), the GNU LGPL (v. 2 and v. 2.1), and
 the GNU FDL should refer
 +   to the corresponding files under

Agreed.  Here's a new patch.  Note that this removes the unversioned
licenses from the non-normative footnote; that's not a normative change
yet, but I do want to discuss that separately under Bug#431109.

--- orig/policy.sgml
+++ mod/policy.sgml
@@ -8653,21 +8653,18 @@
 
p
  Packages distributed under the UCB BSD license, the Artistic
- license, the GNU GPL, and the GNU LGPL, should refer to the
+ license, the GNU GPL (version 2), the GNU LGPL (versions 2 and
+ 2.1), 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,
   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/GPL-2/file,
+  file/usr/share/common-licenses/LGPL-2.1/file,
+  file/usr/share/common-licenses/GFDL-1.2/file, and so
+  on.
 /p
   /footnote rather than quoting them in the copyright
  file. 

-- 
Russ Allbery ([EMAIL PROTECTED])   http://www.eyrie.org/~eagle/


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]