[commits] r7474 - in /fsf/trunk/libc: ./ locale/ locale/programs/ localedata/locales/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Fri Dec  5 00:01:44 2008
New Revision: 7474

Log:
Import glibc-mainline for 2008-12-05

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/locale/iso-639.def
    fsf/trunk/libc/locale/programs/ld-address.c
    fsf/trunk/libc/localedata/locales/sd_IN
    fsf/trunk/libc/localedata/locales/sd_IN@devanagari

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Dec  5 00:01:44 2008
@@ -1,3 +1,8 @@
+2008-12-04  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* locale/programs/ld-address.c (DEFINE_LANGUAGE_CODE2): Define.
+	* locale/iso-639.def: Add Chhattisgarhi entry.
+
 2008-12-02  Ulrich Drepper  <drepper@xxxxxxxxxx>
 
 	* resolv/nss_dns/dns-host.c (_nss_dns_gethostbyname3_r): Recognize

Modified: fsf/trunk/libc/locale/iso-639.def
==============================================================================
--- fsf/trunk/libc/locale/iso-639.def (original)
+++ fsf/trunk/libc/locale/iso-639.def Fri Dec  5 00:01:44 2008
@@ -1,8 +1,9 @@
 /*
- * Defines the languages codes and abbreviations according to ISO 639-[12].
+ * Defines the languages codes and abbreviations according to ISO 639-[123].
  * This is used in ld-address.c (address_finish).
  *
  * Format is: ("English name", 639-1-code, 639-2/T-code, 639-2/B-code)
+ * For some languages which have no 639-2 code the 639-3 code is used.
  * If you find something missing or wrong, please go to the URL
  * http://www.gnu.org/software/libc/bugs.html and follow
  * instructions there to file a bug report.
@@ -89,6 +90,7 @@
 DEFINE_LANGUAGE_CODE ("Chechen", ce, che, che)
 DEFINE_LANGUAGE_CODE3 ("Cherokee", chr, chr)
 DEFINE_LANGUAGE_CODE3 ("Cheyenne", chy, chy)
+DEFINE_LANGUAGE_CODE2 ("Chhattisgarhi", hne)	/* ISO 639-3 */
 DEFINE_LANGUAGE_CODE3 ("Chibcha", chb, chb)
 DEFINE_LANGUAGE_CODE ("Chichewa; Chewa; Nyanja", ny, nya, nya)
 DEFINE_LANGUAGE_CODE ("Chinese", zh, zho, chi)

Modified: fsf/trunk/libc/locale/programs/ld-address.c
==============================================================================
--- fsf/trunk/libc/locale/programs/ld-address.c (original)
+++ fsf/trunk/libc/locale/programs/ld-address.c Fri Dec  5 00:01:44 2008
@@ -1,4 +1,4 @@
-/* Copyright (C) 1998-2002, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1998-2002, 2005, 2006, 2008 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 1998.
 
@@ -57,6 +57,8 @@
   { #Ab, #Term, #Lib },
 #define DEFINE_LANGUAGE_CODE3(Name, Term, Lib) \
   { "", #Term, #Lib },
+#define DEFINE_LANGUAGE_CODE2(Name, Term) \
+  { "", #Term, "" },
 #include "iso-639.def"
 };
 

Modified: fsf/trunk/libc/localedata/locales/sd_IN
==============================================================================
--- fsf/trunk/libc/localedata/locales/sd_IN (original)
+++ fsf/trunk/libc/localedata/locales/sd_IN Fri Dec  5 00:01:44 2008
@@ -7,7 +7,7 @@
 LC_IDENTIFICATION
 
 title      "Sindhi language locale for India"
-source     "Redhat, Pune"
+source     "Red Hat, Pune"
 address    "Marisfot III, Marigold Premises, East-Wing, Kalyaninagar, Pune, India-411014"
 contact    ""
 email      "bug-glibc-locales@xxxxxxx"

Modified: fsf/trunk/libc/localedata/locales/sd_IN@devanagari
==============================================================================
--- fsf/trunk/libc/localedata/locales/sd_IN@devanagari (original)
+++ fsf/trunk/libc/localedata/locales/sd_IN@devanagari Fri Dec  5 00:01:44 2008
@@ -6,7 +6,7 @@
 
 LC_IDENTIFICATION
 title      "Sindhi language locale for India"
-source     "Redhat, Pune"
+source     "Red Hat, Pune"
 address    "Marisfot III, Marigold Premises, East-Wing, Kalyaninagar, Pune, India-411014"
 contact    ""
 email      "bug-glibc-locales@xxxxxxx"