26 files changed, 34 insertions, 30 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 68905b6..c11fb3a 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-24  Werner Koch  <[email protected]>
+
+	Switched license to back to LGPLv2.1.
+
 2007-08-09  Marcus Brinkmann  <[email protected]>
 
 	* assuan.h (assuan_process_done, assuan_inquire_ext): New
@@ -1102,7 +1106,7 @@
 	* assuan-defs.h: Add space in the context for this.
 
 	
- Copyright 2001, 2002, 2006 Free Software Foundation, Inc.
+ Copyright 2001, 2002, 2006, 2007 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without
diff --git a/src/Makefile.am b/src/Makefile.am
index c6a1491..77d87af 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
 #
 # Assuan is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of
+# published by the Free Software Foundation; either version 2.1 of
 # the License, or (at your option) any later version.
 #
 # Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-buffer.c b/src/assuan-buffer.c
index b05f2d2..552bb7b 100644
--- a/src/assuan-buffer.c
+++ b/src/assuan-buffer.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-client.c b/src/assuan-client.c
index 9470f0f..090e7fc 100644
--- a/src/assuan-client.c
+++ b/src/assuan-client.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-connect.c b/src/assuan-connect.c
index 7328ec4..1477a24 100644
--- a/src/assuan-connect.c
+++ b/src/assuan-connect.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-handler.c b/src/assuan-handler.c
index 1cb514a..4aaa592 100644
--- a/src/assuan-handler.c
+++ b/src/assuan-handler.c
@@ -1,11 +1,11 @@
 /* assuan-handler.c - dispatch commands 
- *	Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2007 Free Software Foundation, Inc.
  *
  * This file is part of Assuan.
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-inquire.c b/src/assuan-inquire.c
index 080f4ef..d9d72be 100644
--- a/src/assuan-inquire.c
+++ b/src/assuan-inquire.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-io-pth.c b/src/assuan-io-pth.c
index 69774ff..e0cf8b9 100644
--- a/src/assuan-io-pth.c
+++ b/src/assuan-io-pth.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-io.c b/src/assuan-io.c
index a5e3816..9c2ef91 100644
--- a/src/assuan-io.c
+++ b/src/assuan-io.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-listen.c b/src/assuan-listen.c
index cc86395..2ef9334 100644
--- a/src/assuan-listen.c
+++ b/src/assuan-listen.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-logging.c b/src/assuan-logging.c
index 2245ee3..39752a3 100644
--- a/src/assuan-logging.c
+++ b/src/assuan-logging.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-pipe-connect.c b/src/assuan-pipe-connect.c
index 791fcac..a85b5cc 100644
--- a/src/assuan-pipe-connect.c
+++ b/src/assuan-pipe-connect.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-pipe-server.c b/src/assuan-pipe-server.c
index e5dc15f..7040414 100644
--- a/src/assuan-pipe-server.c
+++ b/src/assuan-pipe-server.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-socket-connect.c b/src/assuan-socket-connect.c
index c77586d..9c574dc 100644
--- a/src/assuan-socket-connect.c
+++ b/src/assuan-socket-connect.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-socket-server.c b/src/assuan-socket-server.c
index 97cddec..664c99f 100644
--- a/src/assuan-socket-server.c
+++ b/src/assuan-socket-server.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-socket.c b/src/assuan-socket.c
index c3fcf0c..1a7827d 100644
--- a/src/assuan-socket.c
+++ b/src/assuan-socket.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-uds.c b/src/assuan-uds.c
index 123a3ad..d502ad8 100644
--- a/src/assuan-uds.c
+++ b/src/assuan-uds.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan-util.c b/src/assuan-util.c
index 6539330..430b346 100644
--- a/src/assuan-util.c
+++ b/src/assuan-util.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/assuan.h b/src/assuan.h
index 3105602..a70fcde 100644
--- a/src/assuan.h
+++ b/src/assuan.h
@@ -1,11 +1,11 @@
 /* assuan.c - Definitions for the Assuan IPC library
- * Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
+ * Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
  *
  * This file is part of Assuan.
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
@@ -325,7 +325,7 @@ typedef enum
        process. */
     ASSUAN_NO_WAITPID = 1,
     /* This flag indicates whether Assuan logging is in confidential
-       mode. Use assuan_{begin,end}_condidential tochange the
+       mode. Use assuan_{begin,end}_condidential to change the
        mode.  */
     ASSUAN_CONFIDENTIAL = 2
   } 
@@ -342,7 +342,7 @@ typedef struct assuan_context_s *ASSUAN_CONTEXT _ASSUAN_DEPRECATED;
 /* Because we use system handles and not libc low level file
    descriptors on W32, we need to declare them as HANDLE (which
    actually is a plain pointer).  This is required to eventually
-   support 64 bits Windows systems.  */
+   support 64 bit Windows systems.  */
 #ifdef _WIN32
 typedef void * assuan_fd_t;
 #define ASSUAN_INVALID_FD ((void*)(-1))
diff --git a/src/funopen.c b/src/funopen.c
index 029131b..363aa59 100644
--- a/src/funopen.c
+++ b/src/funopen.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/isascii.c b/src/isascii.c
index d4290ee..77ed970 100644
--- a/src/isascii.c
+++ b/src/isascii.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/memrchr.c b/src/memrchr.c
index 2a13767..258216c 100644
--- a/src/memrchr.c
+++ b/src/memrchr.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/mkerrors b/src/mkerrors
index 7087fdb..735b794 100755
--- a/src/mkerrors
+++ b/src/mkerrors
@@ -7,7 +7,7 @@
 #
 # Assuan is free software; you can redistribute it and/or modify it
 # under the terms of the GNU Lesser General Public License as
-# published by the Free Software Foundation; either version 3 of
+# published by the Free Software Foundation; either version 2.1 of
 # the License, or (at your option) any later version.
 #
 # Assuan is distributed in the hope that it will be useful, but
diff --git a/src/putc_unlocked.c b/src/putc_unlocked.c
index 74c5b86..80b3aa1 100644
--- a/src/putc_unlocked.c
+++ b/src/putc_unlocked.c
@@ -5,7 +5,7 @@
  *
  * Assuan is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 3 of
+ * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Assuan is distributed in the hope that it will be useful, but
diff --git a/src/setenv.c b/src/setenv.c
index 7c9dcad..ff07d7b 100644
--- a/src/setenv.c
+++ b/src/setenv.c
@@ -4,7 +4,7 @@
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/stpcpy.c b/src/stpcpy.c
index b0b52a4..8c489b8 100644
--- a/src/stpcpy.c
+++ b/src/stpcpy.c
@@ -4,7 +4,7 @@
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
-   version 3 of the License, or (at your option) any later version.
+   version 2.1 of the License, or (at your option) any later version.
 
    The GNU C Library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of