diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-05-14 11:15:22 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-05-14 13:13:53 +0200 |
| commit | e9691db5366a2990ccebf157c757ae60258b46d6 (patch) | |
| tree | f17aa7f144b1acde14902700a13f95055bab6c70 /localedata | |
| parent | 5e6e747fa224df1159f7eb32bc26d44cad0dbb17 (diff) | |
| parent | 6d270188ef3fe10125b8723ed69ebdc9e90e914e (diff) | |
Merge remote branch 'origin/release/2.11/master' into fedora/2.11/master
Diffstat (limited to 'localedata')
| -rw-r--r-- | localedata/ChangeLog | 8 | ||||
| -rw-r--r-- | localedata/Makefile | 5 | ||||
| -rw-r--r-- | localedata/locales/i18n | 3 |
3 files changed, 14 insertions, 2 deletions
diff --git a/localedata/ChangeLog b/localedata/ChangeLog index 88284268a9..4cb9e616aa 100644 --- a/localedata/ChangeLog +++ b/localedata/ChangeLog @@ -1,3 +1,11 @@ +2010-02-16 Paul Pluzhnikov <ppluzhnikov@google.com> + + * Makefile: Add missing gconv-modules dependency. + +2010-01-25 Andreas Schwab <schwab@redhat.com> + + * locales/i18n: Don't map U00DF to U1E9E in toupper table. + 2009-11-24 Ulrich Drepper <drepper@redhat.com> * locales/hsb_DE: Define week, first_weekday, and first_workday. diff --git a/localedata/Makefile b/localedata/Makefile index 1acc415748..921121ff3e 100644 --- a/localedata/Makefile +++ b/localedata/Makefile @@ -107,6 +107,8 @@ install-others := $(addprefix $(inst_i18ndir)/, \ $(addsuffix .gz, $(charmaps)) \ $(locales)) +tests: $(objdir)/iconvdata/gconv-modules + include ../Rules # Install the charmap files in gzipped format. @@ -299,3 +301,6 @@ tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \ LOCPATH=$(common-objpfx)localedata $(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@ + +$(objdir)/iconvdata/gconv-modules: + $(MAKE) -C ../iconvdata subdir=iconvdata $@ diff --git a/localedata/locales/i18n b/localedata/locales/i18n index 8afbb717fa..4f8b9e1591 100644 --- a/localedata/locales/i18n +++ b/localedata/locales/i18n @@ -928,8 +928,7 @@ toupper / (<U006D>,<U004D>);(<U006E>,<U004E>);(<U006F>,<U004F>);(<U0070>,<U0050>);/ (<U0071>,<U0051>);(<U0072>,<U0052>);(<U0073>,<U0053>);(<U0074>,<U0054>);/ (<U0075>,<U0055>);(<U0076>,<U0056>);(<U0077>,<U0057>);(<U0078>,<U0058>);/ - (<U0079>,<U0059>);(<U007A>,<U005A>);(<U00B5>,<U039C>);(<U00DF>,<U1E9E>);/ - (<U00E0>,<U00C0>);/ + (<U0079>,<U0059>);(<U007A>,<U005A>);(<U00B5>,<U039C>);(<U00E0>,<U00C0>);/ (<U00E1>,<U00C1>);(<U00E2>,<U00C2>);(<U00E3>,<U00C3>);(<U00E4>,<U00C4>);/ (<U00E5>,<U00C5>);(<U00E6>,<U00C6>);(<U00E7>,<U00C7>);(<U00E8>,<U00C8>);/ (<U00E9>,<U00C9>);(<U00EA>,<U00CA>);(<U00EB>,<U00CB>);(<U00EC>,<U00CC>);/ |