- merged from DEVEL

Changed files:
    glibc-new-charsets.patch -> 1.7

diff --git a/glibc-new-charsets.patch b/glibc-new-charsets.patch
index 9f84432bc9b7051903ffd1f39a61c9ca5becf08e..649b37d7b2f5314b2c18efd3e45d725e10363d09 100644 (file)
--- a/glibc-new-charsets.patch
+++ b/glibc-new-charsets.patch
@@ -97,7 +97,7 @@ diff -uNr libc/iconvdata/gconv-modules libc.charsets/iconvdata/gconv-modules
  alias ISO_8859-16:2001//      ISO-8859-16//
  alias ISO_8859-16//           ISO-8859-16//
  module        ISO-8859-16//           INTERNAL                ISO8859-16      1
-@@ -1516,18 +1525,24 @@
+@@ -1517,18 +1526,24 @@
  module        INTERNAL                GB18030//               GB18030         1
  
  #     from                    to                      module          cost
@@ -122,7 +122,7 @@ diff -uNr libc/iconvdata/gconv-modules libc.charsets/iconvdata/gconv-modules
  module        GEORGIAN-ACADEMY//      INTERNAL                GEORGIAN-ACADEMY 1
  module        INTERNAL                GEORGIAN-ACADEMY//      GEORGIAN-ACADEMY 1
  
-@@ -1559,10 +1574,14 @@
+@@ -1560,10 +1575,14 @@
  module        INTERNAL                Shift_JISX0213//        SHIFT_JISX0213  1
  
  #     from                    to                      module          cost
@@ -137,12 +137,10 @@ diff -uNr libc/iconvdata/gconv-modules libc.charsets/iconvdata/gconv-modules
  module        PT154//                 INTERNAL                PT154           1
  module        INTERNAL                PT154//                 PT154           1
  
-@@ -1570,3 +1589,59 @@
- alias STRK1048-2002//         RK1048//
- module        RK1048//                INTERNAL                RK1048          1
+@@ -1573,6 +1592,62 @@
  module        INTERNAL                RK1048//                RK1048          1
-+
-+#     from                    to                      module          cost
+ 
+ #     from                    to                      module          cost
 +alias ISCII-91//              ISCII-DEV//
 +alias IS13194:1991//          ISCII-DEV//
 +alias IS13194-DEV//           ISCII-DEV//
@@ -197,6 +195,11 @@ diff -uNr libc/iconvdata/gconv-modules libc.charsets/iconvdata/gconv-modules
 +alias GREEK8-EURO//           ISO-8859-7-EURO//
 +module        ISO-8859-7-EURO//       INTERNAL                ISO8859-7-EURO  1
 +module        INTERNAL                ISO-8859-7-EURO//       ISO8859-7-EURO  1
++
++#     from                    to                      module          cost
+ alias IBM-1025//              IBM1025//
+ alias CP1025//                IBM1025//
+ alias CSIBM1025//             IBM1025//
 diff -uNr libc/iconvdata/iscii-dev.c libc.charsets/iconvdata/iscii-dev.c
 --- libc/iconvdata/iscii-dev.c Thu Jan  1 01:00:00 1970
 +++ libc.charsets/iconvdata/iscii-dev.c        Mon Jan 12 23:47:54 2004