Mercurial > hg > xemacs-beta

changeset 5417:dd9541c73e70

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Converted the modules samples to GPLv3 or later.
author Mats Lidell <matsl@xemacs.org>
date Wed, 27 Oct 2010 21:46:49 +0200
parents 365bc8cb5894
children 56b64a055043
files modules/sample/external/Makefile.in.in modules/sample/external/configure.ac modules/sample/external/sample.c modules/sample/internal/configure.ac modules/sample/internal/sample.c
diffstat 5 files changed, 20 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/modules/sample/external/Makefile.in.in	Wed Oct 27 00:09:04 2010 +0200
+++ b/modules/sample/external/Makefile.in.in	Wed Oct 27 21:46:49 2010 +0200
@@ -3,8 +3,8 @@
 ##
 ##   This sample Makefile is free; 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.
+##   Free Software Foundation, either version 3 of the License, or (at your
+##   option) any later version.
 
 ## This file is not part of XEmacs.
 
--- a/modules/sample/external/configure.ac	Wed Oct 27 00:09:04 2010 +0200
+++ b/modules/sample/external/configure.ac	Wed Oct 27 21:46:49 2010 +0200
@@ -1,8 +1,8 @@
 # Process this file with autoconf to produce a configure script.
 # This sample autoconf input script is free; 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.
+# the Free Software Foundation, either version 3 of the License, or (at your
+# option) any later version.
 AC_INIT([Sample module], [1.0], [xemacs-beta@xemacs.org])
 AC_PREREQ(2.53)
 AC_REVISION($Revision: 1.1 $)
--- a/modules/sample/external/sample.c	Wed Oct 27 00:09:04 2010 +0200
+++ b/modules/sample/external/sample.c	Wed Oct 27 21:46:49 2010 +0200
@@ -4,10 +4,10 @@
  * (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
  * (C) Copyright 2002 Jerry James.
  *
- * This sample module code 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 sample 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.
  */
 
 #include <config.h>
--- a/modules/sample/internal/configure.ac	Wed Oct 27 00:09:04 2010 +0200
+++ b/modules/sample/internal/configure.ac	Wed Oct 27 21:46:49 2010 +0200
@@ -8,20 +8,18 @@
 
 This file is part of XEmacs.
 
-XEmacs 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
+XEmacs 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.
 
-XEmacs 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.
+XEmacs 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 XEmacs; see the file COPYING.  If not, write to the Free
-Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.])
+along with XEmacs.  If not, see <http://www.gnu.org/licenses/>.])
 
 AC_CONFIG_SRCDIR([sample.c])
 AC_PROG_CC
--- a/modules/sample/internal/sample.c	Wed Oct 27 00:09:04 2010 +0200
+++ b/modules/sample/internal/sample.c	Wed Oct 27 21:46:49 2010 +0200
@@ -4,10 +4,10 @@
  * (C) Copyright 1998, 1999 J. Kean Johnston. All rights reserved.
  * (C) Copyright 2002 Jerry James.
  *
- * This sample module code 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 sample 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.
  */
 
 #include <config.h>