summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--iconvdata/gconv-modules4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 35ff9d745d..292e70b931 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-09  Aurelien Jarno  <aurelien@aurel32.net>
+
+	* iconvdata/gconv-modules: Use LATIN9 as an alias to ISO-8859-15,
+	not LATIN-9.
+
 2008-10-31  Ulrich Drepper  <drepper@redhat.com>
 
 	[BZ #6867]
diff --git a/iconvdata/gconv-modules b/iconvdata/gconv-modules
index a14dbbe9d6..ad8d479174 100644
--- a/iconvdata/gconv-modules
+++ b/iconvdata/gconv-modules
@@ -1,5 +1,5 @@
 # GNU libc iconv configuration.
-# Copyright (C) 1997-2004, 2005, 2007 Free Software Foundation, Inc.
+# Copyright (C) 1997-2004, 2005, 2007, 2008 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -394,7 +394,7 @@ alias	ISO8859-15//		ISO-8859-15//
 alias	ISO885915//		ISO-8859-15//
 alias	ISO-IR-203//		ISO-8859-15//
 alias	ISO_8859-15//		ISO-8859-15//
-alias	LATIN-9//		ISO-8859-15//
+alias	LATIN9//		ISO-8859-15//
 alias	ISO_8859-15:1998//	ISO-8859-15//
 module	ISO-8859-15//		INTERNAL		ISO8859-15	1
 module	INTERNAL		ISO-8859-15//		ISO8859-15	1