--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,49 @@
+2011-03-29  Bruno Haible  <bruno@clisp.org>
+
+	Relicense some modules under LGPLv2+, for libidn2.
+	* modules/array-mergesort (License): Change to LGPLv2+.
+	* modules/c-strcaseeq (License): Likewise.
+	* modules/striconveh (License): Likewise.
+	* modules/striconveha (License): Likewise.
+	* modules/uniconv/base (License): Likewise.
+	* modules/uniconv/u8-conv-from-enc (License): Likewise.
+	* modules/uniconv/u8-strconv-from-enc (License): Likewise.
+	* modules/uniconv/u8-strconv-from-locale (License): Likewise.
+	* modules/unictype/base (License): Likewise.
+	* modules/unictype/bidiclass-of (License): Likewise.
+	* modules/unictype/category-M (License): Likewise.
+	* modules/unictype/category-none (License): Likewise.
+	* modules/unictype/category-of (License): Likewise.
+	* modules/unictype/category-test (License): Likewise.
+	* modules/unictype/category-test-withtable (License): Likewise.
+	* modules/unictype/combining-class (License): Likewise.
+	* modules/unictype/joiningtype-of (License): Likewise.
+	* modules/unictype/scripts (License): Likewise.
+	* modules/uninorm/base (License): Likewise.
+	* modules/uninorm/canonical-decomposition (License): Likewise.
+	* modules/uninorm/composition (License): Likewise.
+	* modules/uninorm/decompose-internal (License): Likewise.
+	* modules/uninorm/decomposition-table (License): Likewise.
+	* modules/uninorm/nfc (License): Likewise.
+	* modules/uninorm/nfd (License): Likewise.
+	* modules/uninorm/u32-normalize (License): Likewise.
+	* modules/unistr/base (License): Likewise.
+	* modules/unistr/u32-cpy (License): Likewise.
+	* modules/unistr/u32-mbtouc-unsafe (License): Likewise.
+	* modules/unistr/u32-to-u8 (License): Likewise.
+	* modules/unistr/u32-uctomb (License): Likewise.
+	* modules/unistr/u8-check (License): Likewise.
+	* modules/unistr/u8-mblen (License): Likewise.
+	* modules/unistr/u8-mbtouc (License): Likewise.
+	* modules/unistr/u8-mbtouc-unsafe (License): Likewise.
+	* modules/unistr/u8-mbtoucr (License): Likewise.
+	* modules/unistr/u8-prev (License): Likewise.
+	* modules/unistr/u8-strlen (License): Likewise.
+	* modules/unistr/u8-to-u32 (License): Likewise.
+	* modules/unistr/u8-uctomb (License): Likewise.
+	* modules/unitypes (License): Likewise.
+	Requested by Simon Josefsson.
+
 2011-03-29  Simon Josefsson  <simon@josefsson.org>
 
 	lib-symbol-visibility: Add a notice.

--- a/modules/array-mergesort
+++ b/modules/array-mergesort
@@ -14,7 +14,7 @@
 "array-mergesort.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/c-strcaseeq
+++ b/modules/c-strcaseeq
@@ -16,7 +16,7 @@
 "c-strcaseeq.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/striconveh
+++ b/modules/striconveh
@@ -39,7 +39,7 @@
 $(LTLIBICONV) when linking with libtool, $(LIBICONV) otherwise
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/striconveha
+++ b/modules/striconveha
@@ -22,7 +22,7 @@
 "striconveha.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uniconv/base
+++ b/modules/uniconv/base
@@ -29,7 +29,7 @@
 "uniconv.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uniconv/u8-conv-from-enc
+++ b/modules/uniconv/u8-conv-from-enc
@@ -23,7 +23,7 @@
 "uniconv.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uniconv/u8-strconv-from-enc
+++ b/modules/uniconv/u8-strconv-from-enc
@@ -22,7 +22,7 @@
 "uniconv.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uniconv/u8-strconv-from-locale
+++ b/modules/uniconv/u8-strconv-from-locale
@@ -21,7 +21,7 @@
 "uniconv.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/base
+++ b/modules/unictype/base
@@ -27,7 +27,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/bidiclass-of
+++ b/modules/unictype/bidiclass-of
@@ -20,7 +20,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/category-M
+++ b/modules/unictype/category-M
@@ -20,7 +20,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/category-none
+++ b/modules/unictype/category-none
@@ -19,7 +19,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/category-of
+++ b/modules/unictype/category-of
@@ -22,7 +22,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/category-test
+++ b/modules/unictype/category-test
@@ -21,7 +21,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/category-test-withtable
+++ b/modules/unictype/category-test-withtable
@@ -15,7 +15,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/combining-class
+++ b/modules/unictype/combining-class
@@ -20,7 +20,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/joiningtype-of
+++ b/modules/unictype/joiningtype-of
@@ -21,7 +21,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unictype/scripts
+++ b/modules/unictype/scripts
@@ -30,7 +30,7 @@
 "unictype.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/base
+++ b/modules/uninorm/base
@@ -26,7 +26,7 @@
 "uninorm.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/canonical-decomposition
+++ b/modules/uninorm/canonical-decomposition
@@ -20,7 +20,7 @@
 "uninorm.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/composition
+++ b/modules/uninorm/composition
@@ -29,7 +29,7 @@
 "uninorm.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/decompose-internal
+++ b/modules/uninorm/decompose-internal
@@ -18,7 +18,7 @@
 "uninorm/decompose-internal.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/decomposition-table
+++ b/modules/uninorm/decomposition-table
@@ -20,7 +20,7 @@
 "uninorm/decomposition-table.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/nfc
+++ b/modules/uninorm/nfc
@@ -23,7 +23,7 @@
 "uninorm.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/nfd
+++ b/modules/uninorm/nfd
@@ -21,7 +21,7 @@
 "uninorm.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/uninorm/u32-normalize
+++ b/modules/uninorm/u32-normalize
@@ -27,7 +27,7 @@
 "uninorm.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/base
+++ b/modules/unistr/base
@@ -29,7 +29,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u32-cpy
+++ b/modules/unistr/u32-cpy
@@ -20,7 +20,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u32-mbtouc-unsafe
+++ b/modules/unistr/u32-mbtouc-unsafe
@@ -20,7 +20,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u32-to-u8
+++ b/modules/unistr/u32-to-u8
@@ -20,7 +20,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u32-uctomb
+++ b/modules/unistr/u32-uctomb
@@ -20,7 +20,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-check
+++ b/modules/unistr/u8-check
@@ -19,7 +19,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-mblen
+++ b/modules/unistr/u8-mblen
@@ -19,7 +19,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-mbtouc
+++ b/modules/unistr/u8-mbtouc
@@ -21,7 +21,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-mbtouc-unsafe
+++ b/modules/unistr/u8-mbtouc-unsafe
@@ -21,7 +21,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-mbtoucr
+++ b/modules/unistr/u8-mbtoucr
@@ -20,7 +20,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-prev
+++ b/modules/unistr/u8-prev
@@ -19,7 +19,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-strlen
+++ b/modules/unistr/u8-strlen
@@ -19,7 +19,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-to-u32
+++ b/modules/unistr/u8-to-u32
@@ -20,7 +20,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unistr/u8-uctomb
+++ b/modules/unistr/u8-uctomb
@@ -21,7 +21,7 @@
 "unistr.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible

--- a/modules/unitypes
+++ b/modules/unitypes
@@ -26,7 +26,7 @@
 "unitypes.h"
 
 License:
-LGPL
+LGPLv2+
 
 Maintainer:
 Bruno Haible