GPLv3 fixes.

diff --git a/Makefile.am b/Makefile.am
index 82d4eba4a87979cda7278bd4cb994ece18f27c02..b07ca9446a3d74cab0db523d92e549a9ab942c3b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,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/examples/Makefile.am b/doc/examples/Makefile.am
index ffdd22bb6e4ed53895f222c09467ccf1965b0e03..0370a2c6b01a6177168244efb6f638a006549bea 100644 (file)
--- a/doc/examples/Makefile.am
+++ b/doc/examples/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/manpages/Makefile.am b/doc/manpages/Makefile.am
index 9a5972f30b0e66acb60afa888e7ab4bc09695ed0..774fd1e7e003d7f4f1c61f650265c18e99c5464f 100644 (file)
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/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/includes/gnutls/extra.h b/includes/gnutls/extra.h
index 4775951e6da38eebbd36c734f044efa5380daee8..d0a90242a33de36b564b4c95cb6421f84be08fac 100644 (file)
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -7,7 +7,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
+ * published by 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, but

diff --git a/includes/gnutls/openssl.h b/includes/gnutls/openssl.h
index bf85e6e49047118247220cb625440e2fddc1c645..7cf77eb72f8258f98a9e1ce5c589ebf382f0051f 100644 (file)
--- a/includes/gnutls/openssl.h
+++ b/includes/gnutls/openssl.h
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2004, 2005 Free Software Foundation
+ * Copyright (C) 2004, 2005, 2007 Free Software Foundation
  * Copyright (c) 2002 Andrew McDonald <andrew@mcdonald.org.uk>
  *
  * This file is part of GNUTLS-EXTRA.
  *
  * 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
+ * published by 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, but

diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index d1b0967f3ebed06119f7d179ad70998f0c4a742b..6cf971c854d4a4d232987e8bae8b8bfa18fecd87 100644 (file)
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -7,7 +7,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
+# published by 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, but

diff --git a/libextra/gnutls_extra.h b/libextra/gnutls_extra.h
index 9f72bff2eaa5e062a04e8bf981c8d30fc58b3b9e..de7fc8891ca8e412529a0d47dd3bd683482157ca 100644 (file)
--- a/libextra/gnutls_extra.h
+++ b/libextra/gnutls_extra.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation
+ * Copyright (C) 2002, 2003, 2004, 2005, 2007 Free Software Foundation
  *
  * Author: Nikos Mavrogiannopoulos
  *
@@ -7,7 +7,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
+ * published by 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, but

diff --git a/libextra/libgnutls-extra.vers b/libextra/libgnutls-extra.vers
index bf5198b2668c9799e54dc2669ceb38be0734d9a1..3a3cd1cb9cafb40fc29362749e8b5bb6b370f452 100644 (file)
--- a/libextra/libgnutls-extra.vers
+++ b/libextra/libgnutls-extra.vers
@@ -1,5 +1,5 @@
 # libgnutls-extra.vers -- Versioning script to control what symbols to export.
-# Copyright (C) 2005 Free Software Foundation
+# Copyright (C) 2005, 2007 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -7,7 +7,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
+# published by 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, but

diff --git a/libextra/openpgp/Makefile.am b/libextra/openpgp/Makefile.am
index 7ac477010f08d51b6df892b183a83f0096b91db3..512aeb65ae9f78457557a8f4e06f1640ece717cf 100644 (file)
--- a/libextra/openpgp/Makefile.am
+++ b/libextra/openpgp/Makefile.am
@@ -7,7 +7,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
+# published by 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, but

diff --git a/libextra/openssl_compat.h b/libextra/openssl_compat.h
index b002ea9527d223fb0ad1cc7201d02495b6ba699a..a7559365a8020796ec44fcb29f4fa2900b302fa4 100644 (file)
--- a/libextra/openssl_compat.h
+++ b/libextra/openssl_compat.h
@@ -7,7 +7,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
+ * published by 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, but

diff --git a/maint-cfg.mk b/maint-cfg.mk
index 7c477ea39292bc92dd045bebfbc5b976070f5808..12d25efe08b1d52bda8dbd768559147aa79171c5 100644 (file)
--- a/maint-cfg.mk
+++ b/maint-cfg.mk
@@ -6,7 +6,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