From: Ulrich Drepper <drepper@redhat.com>
Date: Sun, 30 Jun 2002 19:20:39 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2-3~686
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=7cccc6f932adf8ee60407476ef11c2b56b6e6708;p=glibc.git

Update.

2002-06-30  Ulrich Drepper  <drepper@redhat.com>

	* locales/iso14651_t1: Fix U0406 handling (MIN -> CAP).
	Patch by Alexander Mikhailian <lowry@altern.org> [PR libc/3566].
---

diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index aeb4ff979b..43083b0bbf 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -279,6 +279,7 @@ $(addprefix $(inst_gconvdir)/, $(modules.so)): \
 	$(do-install-program)
 $(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
 	$(do-install)
+ifeq (no,$(cross-compiling))
 # Update the $(prefix)/lib/gconv/gconv-modules.cache file. This is necessary
 # if this libc has more gconv modules than the previously installed one.
 	if test -f "$(inst_gconvdir)/gconv-modules.cache"; then \
@@ -287,6 +288,9 @@ $(inst_gconvdir)/gconv-modules: gconv-modules $(+force)
 	   $(common-objpfx)iconv/iconvconfig \
 	     $(addprefix --prefix=,$(install_root)); \
 	fi
+else
+	@echo '*@*@*@ You should recreate $(inst_gconvdir)/gconv-modules.cache'
+endif
 
 endif # build-shared = yes
 
diff --git a/localedata/ChangeLog b/localedata/ChangeLog
index 4f4451dae2..4e58dd5c39 100644
--- a/localedata/ChangeLog
+++ b/localedata/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-30  Ulrich Drepper  <drepper@redhat.com>
+
+	* locales/iso14651_t1: Fix U0406 handling (MIN -> CAP).
+	Patch by Alexander Mikhailian <lowry@altern.org> [PR libc/3566].
+
 2002-06-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* locales/mt_MT: Add locale-specific collation info.
diff --git a/localedata/locales/iso14651_t1 b/localedata/locales/iso14651_t1
index 6ca63358e0..5985490800 100644
--- a/localedata/locales/iso14651_t1
+++ b/localedata/locales/iso14651_t1
@@ -1408,7 +1408,6 @@ order_start <CYRIL>;forward;forward;forward;forward,position
 <U0455> <CYR-DZE>;<BAS>;<MIN>;IGNORE
 <U0438> <CYR-I>;<BAS>;<MIN>;IGNORE
 <U0456> <UKR-I>;<BAS>;<MIN>;IGNORE
-<U0406> <UKR-I>;<BAS>;<MIN>;IGNORE
 <U0457> <UKR-YI>;<BAS>;<MIN>;IGNORE
 <U0439> <CYR-IBRE>;<BAS>;<MIN>;IGNORE
 <U0458> <CYR-JE>;<BAS>;<MIN>;IGNORE
@@ -1454,6 +1453,7 @@ order_start <CYRIL>;forward;forward;forward;forward,position
 <U0417> <CYR-ZE>;<BAS>;<CAP>;IGNORE
 <U0405> <CYR-DZE>;<BAS>;<CAP>;IGNORE
 <U0418> <CYR-I>;<BAS>;<CAP>;IGNORE
+<U0406> <UKR-I>;<BAS>;<CAP>;IGNORE
 <U0407> <UKR-YI>;<BAS>;<CAP>;IGNORE
 <U0419> <CYR-IBRE>;<BAS>;<CAP>;IGNORE
 <U0408> <CYR-JE>;<BAS>;<CAP>;IGNORE