More GPLv3 fixes.

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5453bcb34f867ee203d18e41e5cbf909903dee18..bdaace52a14c0aacf22c1f0f0f89c93d6643629b 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,7 +7,7 @@
 #
 # This file 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful, but

diff --git a/doc/credentials/Makefile.am b/doc/credentials/Makefile.am
index e582de21e61747bd13c7e87e45ad9a935aa7c8f5..c599d96d8c1a2f2cc6657695bdd3d89bfc6d1c79 100644 (file)
--- a/doc/credentials/Makefile.am
+++ b/doc/credentials/Makefile.am
@@ -7,7 +7,7 @@
 #
 # This file 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful, but

diff --git a/doc/extract-guile-c-doc.scm b/doc/extract-guile-c-doc.scm
index aa80b63c47398a1bc5b7ed9e3e3536f6f6aa220c..0dc5099c657b2062ba830153e6b26cc601fa55f5 100644 (file)
--- a/doc/extract-guile-c-doc.scm
+++ b/doc/extract-guile-c-doc.scm
@@ -5,7 +5,7 @@
 ;;;
 ;;; 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 of the License, or
+;;; 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,

diff --git a/doc/guile.texi b/doc/guile.texi
index 53c0e50f765497ac3184e9ee99a656fd43122642..728c674e96e009b77a87e2634c6cbf81cd91ce13 100644 (file)
--- a/doc/guile.texi
+++ b/doc/guile.texi
@@ -607,7 +607,7 @@ Lesser General Public Licence, version 2.1 or later.
 
 This section lists the Scheme procedures exported by the @code{(gnutls
 extra)} module.  This module is licenced under the GNU General Public
-Licence, version 2 or later.
+Licence, version 3 or later.
 
 @include extra.c.texi
 

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 9777d061874d9b17680685aa817df1779b882c0d..74fa185663af52ad1b842b29a48cbe369e7f1d67 100644 (file)
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -7,7 +7,7 @@
 #
 # This file 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful, but

diff --git a/guile/modules/gnutls/extra.scm b/guile/modules/gnutls/extra.scm
index 73f89b2215020738df47fd85d4c70cb3645bc22a..989c524aa9e157c4922d02c75a447109147ffd82 100644 (file)
--- a/guile/modules/gnutls/extra.scm
+++ b/guile/modules/gnutls/extra.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; GNUTLS-EXTRA 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 of the License, or
+;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
 ;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,

diff --git a/guile/modules/system/documentation/c-snarf.scm b/guile/modules/system/documentation/c-snarf.scm
index 204aa90c2475b6c24adc3ec6bb70c681f8ef2acc..cf86710299c6cd925146722433ad63dc3a4c78b8 100644 (file)
--- a/guile/modules/system/documentation/c-snarf.scm
+++ b/guile/modules/system/documentation/c-snarf.scm
@@ -1,11 +1,11 @@
 ;;; c-snarf.scm  --  Parsing documentation "snarffed" from C files.
 ;;;
-;;; Copyright 2006  Free Software Foundation
+;;; Copyright 2006, 2007  Free Software Foundation
 ;;;
 ;;;
 ;;; 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 of the License, or
+;;; 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,

diff --git a/guile/modules/system/documentation/output.scm b/guile/modules/system/documentation/output.scm
index b760dc7bec6919591586fc72670a7a11853ce9cf..2057f775c730d22120d7720f210ed4e21908f584 100644 (file)
--- a/guile/modules/system/documentation/output.scm
+++ b/guile/modules/system/documentation/output.scm
@@ -5,7 +5,7 @@
 ;;;
 ;;; 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 of the License, or
+;;; 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,

diff --git a/guile/pre-inst-guile.in b/guile/pre-inst-guile.in
index 62bac03e03984b7dc8cebc1bd3513cd926fc228b..be2e38ee7f11ef0a8abc37c22f044015cba71c07 100644 (file)
--- a/guile/pre-inst-guile.in
+++ b/guile/pre-inst-guile.in
@@ -4,7 +4,7 @@
 #
 # 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 of the License, or
+# 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,

diff --git a/guile/src/extra.c b/guile/src/extra.c
index 41a033c802646204ce32aa65cc17994ddf09dba2..03bb4129d1621ce2c656a24b6a932311f3f399da 100644 (file)
--- a/guile/src/extra.c
+++ b/guile/src/extra.c
@@ -3,7 +3,7 @@
 
    GNUTLS-EXTRA 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 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    GNUTLS-EXTRA is distributed in the hope that it will be useful,

diff --git a/guile/tests/openpgp-auth.scm b/guile/tests/openpgp-auth.scm
index 3e58c248f1934deba0fd2206e44f28fb56c195eb..aac4e9f9560ffc2ee3882ef1d41cb201bc8b24ee 100644 (file)
--- a/guile/tests/openpgp-auth.scm
+++ b/guile/tests/openpgp-auth.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; GNUTLS-EXTRA 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 of the License, or
+;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
 ;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,

diff --git a/guile/tests/openpgp-keyring.scm b/guile/tests/openpgp-keyring.scm
index 2fbe839eaa56e4450888e506a4f4e4de96917096..721cb3488f712781c59a27a57ec0a8dc56a73234 100644 (file)
--- a/guile/tests/openpgp-keyring.scm
+++ b/guile/tests/openpgp-keyring.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; GNUTLS-EXTRA 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 of the License, or
+;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
 ;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,

diff --git a/guile/tests/openpgp-keys.scm b/guile/tests/openpgp-keys.scm
index 29cbe821efc53f9e0994fb98f49d50f3da7f0eab..7e98241cf5fd1a32b3b7e4124a4391739dd33d8b 100644 (file)
--- a/guile/tests/openpgp-keys.scm
+++ b/guile/tests/openpgp-keys.scm
@@ -3,7 +3,7 @@
 ;;;
 ;;; GNUTLS-EXTRA 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 of the License, or
+;;; the Free Software Foundation; either version 3 of the License, or
 ;;; (at your option) any later version.
 ;;;
 ;;; GNUTLS-EXTRA is distributed in the hope that it will be useful,

diff --git a/includes/Makefile.am b/includes/Makefile.am
index 18389d4292ecd75fa3a2e0f46c9b8b97a5bde10a..ab74ad59345a2cd2e4821a67c87cc812aba9242a 100644 (file)
--- a/includes/Makefile.am
+++ b/includes/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
 #
 # Author: Nikos Mavroyanopoulos
 #
@@ -7,7 +7,7 @@
 #
 # This file 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 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This file is distributed in the hope that it will be useful, but