about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--iconvdata/gconv-modules2
-rw-r--r--localedata/charmaps/ISO-8859-102
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 3702a7d9ff..f63ee9cb3f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-11-29  Ulrich Drepper  <drepper@cygnus.com>
+
+	* iconvdata/gconv-modules: Correct alias for ISO-8859-10.  This
+	standard was issued in 1992.  Reported by Bruno Haible <haible@ilog.fr>.
+
 1999-11-29  Thorsten Kukuk  <kukuk@suse.de>
 
 	* sysdeps/unix/sysv/linux/sparc/bits/signum.h: Add define for
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index a6509ad14e..4149eb56d7 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -324,7 +324,7 @@ module	INTERNAL		ISO-8859-9//		ISO8859-9	1
 
 #	from			to			module		cost
 alias	ISO-IR-157//		ISO-8859-10//
-alias	ISO_8859-10:1993//	ISO-8859-10//
+alias	ISO_8859-10:1992//	ISO-8859-10//
 alias	ISO_8859-10//		ISO-8859-10//
 alias	LATIN6//		ISO-8859-10//
 alias	L6//			ISO-8859-10//
diff --git a/localedata/charmaps/ISO-8859-10 b/localedata/charmaps/ISO-8859-10
index 9b35d0d426..7a6ae8900d 100644
--- a/localedata/charmaps/ISO-8859-10
+++ b/localedata/charmaps/ISO-8859-10
@@ -6,7 +6,7 @@
 %  source: ECMA registry
 
 % alias ISO-IR-157
-% alias ISO_8859-10:1993
+% alias ISO_8859-10:1992
 % alias ISO_8859-10
 % alias L6
 % alias LATIN6