[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC] all-permissive license uses
|
From: |
Eric Blake |
|
Subject: |
[RFC] all-permissive license uses |
|
Date: |
Mon, 4 May 2009 15:50:02 +0000 (UTC) |
|
User-agent: |
Loom/3.14 (http://gmane.org/) |
The GNU Maintainer standards were recently updated to revamp the wording of the
recommended all-permissive license. Additionally,
http://www.gnu.org/prep/maintain/maintain.html#License-Notices-for-Other-Files
states that the all-permissive license is appropriate for README and other
rough documentation, as well as for any m4 macros designed to be useful in
external packages. So, with that in mind, I'm considering relicensing several
files at the top level (some previously under GPLv3 or GFDL 1.3) to instead be
under the all-permissive license, alongside updating files already under an all-
permissive license to use the recommended wording. Any comments on this patch,
particularly if there are any files listed below that I should keep under a
different license than all-permissive?
From: Eric Blake <address@hidden>
Date: Mon, 4 May 2009 09:41:41 -0600
Subject: [PATCH] Update uses of all-permissive license.
* ChangeLog: Use latest wording of FSF all-permissive license.
* ChangeLog.0: Likewise.
* ChangeLog.1: Likewise.
* ChangeLog.2: Likewise.
* m4/m4.m4: Likewise.
* m4/make-case.m4: Likewise.
* tests/statesave.m4: Relicense to match rest of testsuite; this
file does not need all-permissive license since it is not designed
for reuse by other packages.
* AUTHORS: Relicense under all-permissive license.
* BUGS: Likewise.
* HACKING: Likewise.
* NEWS: Likewise.
* README: Likewise.
* README-alpha: Likewise.
* README-hacking: Likewise.
* THANKS: Likewise.
* TODO: Likewise.
Signed-off-by: Eric Blake <address@hidden>
---
AUTHORS | 18 +++++-------------
BUGS | 17 ++++-------------
ChangeLog | 25 +++++++++++++++++++++++--
ChangeLog.0 | 5 +++--
ChangeLog.1 | 5 +++--
ChangeLog.2 | 5 +++--
HACKING | 16 ++++------------
NEWS | 19 ++++++-------------
README | 16 ++++------------
README-alpha | 19 ++++++-------------
README-hacking | 18 +++++-------------
THANKS | 10 ++++------
TODO | 20 ++++++--------------
m4/m4.m4 | 14 +++++++++-----
m4/make-case.m4 | 13 ++++++++-----
tests/statesave.m4 | 20 ++++++++++++++++----
16 files changed, 109 insertions(+), 131 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 9c07a86..1099c60 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -100,18 +100,10 @@ mode: text
coding: utf-8
End:
-Copyright (C) 1996, 2000, 2001, 2005, 2007, 2008 Free Software
+Copyright (C) 1996, 2000, 2001, 2005, 2007, 2008, 2009 Free Software
Foundation, Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/BUGS b/BUGS
index 1d32e50..64d8cba 100644
--- a/BUGS
+++ b/BUGS
@@ -5,19 +5,10 @@ file before using Autoconf, and especially git versions of
Autoconf.
Copyright (C) 2000-2002, 2006-2009 Free Software Foundation, Inc.
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-
+ Copying and distribution of this file, with or without
+ modification, are permitted in any medium without royalty provided
+ the copyright notice and this notice are preserved. This file is
+ offered as-is, without warranty of any kind.
Autoconf must not be used in production if there are ``Serious'' bugs,
and use with caution an Autoconf with ``Important bugs''.
diff --git a/ChangeLog b/ChangeLog
index 8286f08..a163b6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
2009-05-04 Eric Blake <address@hidden>
+ Update uses of all-permissive license.
+ * ChangeLog: Use latest wording of FSF all-permissive license.
+ * ChangeLog.0: Likewise.
+ * ChangeLog.1: Likewise.
+ * ChangeLog.2: Likewise.
+ * m4/m4.m4: Likewise.
+ * m4/make-case.m4: Likewise.
+ * tests/statesave.m4: Relicense to match rest of testsuite; this
+ file does not need all-permissive license since it is not designed
+ for reuse by other packages.
+ * AUTHORS: Relicense under all-permissive license.
+ * BUGS: Likewise.
+ * HACKING: Likewise.
+ * NEWS: Likewise.
+ * README: Likewise.
+ * README-alpha: Likewise.
+ * README-hacking: Likewise.
+ * THANKS: Likewise.
+ * TODO: Likewise.
+
Update some upstream files.
* build-aux/config.guess: Resynchronize from upstream.
* build-aux/vc-list-files: Likewise.
@@ -19402,5 +19422,6 @@
Free Software Foundation, Inc.
Copying and distribution of this file, with or without
- modification, are permitted provided the copyright notice and this
- notice are preserved.
+ modification, are permitted in any medium without royalty provided
+ the copyright notice and this notice are preserved. This file is
+ offered as-is, without warranty of any kind.
diff --git a/ChangeLog.0 b/ChangeLog.0
index df72216..c10c848 100644
--- a/ChangeLog.0
+++ b/ChangeLog.0
@@ -348,5 +348,6 @@ Fri Apr 24 10:08:21 1992 David J. MacKenzie
(address@hidden)
Copyright (C) 1992 Free Software Foundation, Inc.
Copying and distribution of this file, with or without
- modification, are permitted provided the copyright notice and this
- notice are preserved.
+ modification, are permitted in any medium without royalty provided
+ the copyright notice and this notice are preserved. This file is
+ offered as-is, without warranty of any kind.
diff --git a/ChangeLog.1 b/ChangeLog.1
index 0282dcd..cd7d784 100644
--- a/ChangeLog.1
+++ b/ChangeLog.1
@@ -1925,5 +1925,6 @@ Mon Jul 20 01:08:01 1992 David J. MacKenzie
(address@hidden)
Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
Copying and distribution of this file, with or without
- modification, are permitted provided the copyright notice and this
- notice are preserved.
+ modification, are permitted in any medium without royalty provided
+ the copyright notice and this notice are preserved. This file is
+ offered as-is, without warranty of any kind.
diff --git a/ChangeLog.2 b/ChangeLog.2
index 13624cd..90bbc2f 100644
--- a/ChangeLog.2
+++ b/ChangeLog.2
@@ -12854,5 +12854,6 @@ Thu Apr 28 12:01:01 1994 David J. MacKenzie
(address@hidden)
Software Foundation, Inc.
Copying and distribution of this file, with or without
- modification, are permitted provided the copyright notice and this
- notice are preserved.
+ modification, are permitted in any medium without royalty provided
+ the copyright notice and this notice are preserved. This file is
+ offered as-is, without warranty of any kind.
diff --git a/HACKING b/HACKING
index 42a31bf..9cab4ac 100644
--- a/HACKING
+++ b/HACKING
@@ -172,15 +172,7 @@ that needs to be updated.
Copyright (C) 2002, 2008, 2009 Free Software Foundation, Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/NEWS b/NEWS
index 11466d6..8594061 100644
--- a/NEWS
+++ b/NEWS
@@ -1867,20 +1867,13 @@ Various bug fixes.
-----
Copyright (C) 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
Local Variables:
mode: outline
diff --git a/README b/README
index 593ee86..5524941 100644
--- a/README
+++ b/README
@@ -64,15 +64,7 @@ For more licensing information, see
Copyright (C) 1992, 1993, 1994, 1998, 2000, 2001, 2002, 2003, 2004,
2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/README-alpha b/README-alpha
index c0b9337..dea7deb 100644
--- a/README-alpha
+++ b/README-alpha
@@ -22,17 +22,10 @@ users.
-----
-Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2009 Free Software Foundation,
+Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/README-hacking b/README-hacking
index 5d84404..6eb8c44 100644
--- a/README-hacking
+++ b/README-hacking
@@ -126,17 +126,9 @@ Enjoy!
-----
-Copyright (C) 2002-2008 Free Software Foundation, Inc.
+Copyright (C) 2002-2009 Free Software Foundation, Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/THANKS b/THANKS
index da6da7e..b71c208 100644
--- a/THANKS
+++ b/THANKS
@@ -390,9 +390,7 @@ End:
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
2008, 2009 Free Software Foundation, Inc.
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.2 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
-Texts. A copy of the license is included in the ``GNU Free
-Documentation License'' file as part of this distribution.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/TODO b/TODO
index f85ba54..133df88 100644
--- a/TODO
+++ b/TODO
@@ -592,18 +592,10 @@ with autoconf scripts.
------------------------------------------------------------------------------
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2007, 2008
-Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2007, 2008,
+2009 Free Software Foundation, Inc.
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program. If not, see <http://www.gnu.org/licenses/>.
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved. This file is offered as-is,
+without warranty of any kind.
diff --git a/m4/m4.m4 b/m4/m4.m4
index f27d8c0..dd90cca 100644
--- a/m4/m4.m4
+++ b/m4/m4.m4
@@ -1,8 +1,12 @@
-# m4.m4 serial 5
-dnl Copyright (C) 2000, 2006, 2007, 2008 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# m4.m4 serial 6
+
+# Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved. This file is offered as-is,
+# without warranty of any kind.
# AC_PROG_GNU_M4
# --------------
diff --git a/m4/make-case.m4 b/m4/make-case.m4
index b23ccf9..717e6de 100644
--- a/m4/make-case.m4
+++ b/m4/make-case.m4
@@ -1,8 +1,11 @@
-# make-case.m4 serial 0
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# make-case.m4 serial 1
+
+# Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the notice and
+# this notice are preserved. This file is offered as-is, without
+# warranty of any kind.
# AC_PROG_MAKE_CASE_SENSITIVE
# ---------------------------
diff --git a/tests/statesave.m4 b/tests/statesave.m4
index 30cedc2..83f05e9 100644
--- a/tests/statesave.m4
+++ b/tests/statesave.m4
@@ -1,10 +1,22 @@
-# statesave.m4 serial 1
+# statesave.m4 serial 2
# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
# 2009 Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# AC_STATE_SAVE(FILE)
# -------------------
--
1.6.2.4
- [RFC] all-permissive license uses,
Eric Blake <=