2008-05-21  Ulrich Drepper  <drepper@redhat.com>

	* iconvdata/Depend: Add localedata.

 2008-05-14  Joseph Myers  <joseph@codesourcery.com>

	* iconvdata/Makefile (bug-iconv6-ENV, tst-iconv7-ENV): Define.

 2008-05-14  Ulrich Drepper  <drepper@redhat.com>
 
	* iconvdata/bug-iconv6.c (do_test): Use de_DE.UTF-8 locale.

===================================================================
RCS file: /cvs/glibc/libc/iconvdata/Makefile,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- libc/iconvdata/Makefile	2008/01/09 20:03:36	1.156
+++ libc/iconvdata/Makefile	2008/05/15 01:54:31	1.157
@@ -73,6 +73,9 @@
 endif
 
 test-srcs := tst-table-from tst-table-to
+
+bug-iconv6-ENV = LOCPATH=$(common-objpfx)localedata
+tst-iconv7-ENV = LOCPATH=$(common-objpfx)localedata
 endif
 
 # No code here is in libc.so.
===================================================================
RCS file: /cvs/glibc/libc/iconvdata/bug-iconv6.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libc/iconvdata/bug-iconv6.c	2007/11/07 23:58:04	1.1
+++ libc/iconvdata/bug-iconv6.c	2008/05/15 01:56:43	1.2
@@ -13,7 +13,7 @@
 static int
 do_test (void)
 {
-  setlocale (LC_ALL, "en_US.UTF-8");
+  setlocale (LC_ALL, "de_DE.UTF-8");
   iconv_t ic = iconv_open ("ISO-2022-JP//TRANSLIT", "UTF-8");
   if (ic == (iconv_t) -1)
     {
===================================================================
RCS file: /cvs/glibc/libc/iconvdata/Depend,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libc/iconvdata/Depend	2000/06/12 19:00:18	1.1
+++ libc/iconvdata/Depend	2008/05/21 22:45:28	1.2
@@ -1 +1,2 @@
 iconv
+localedata