r1833 - in glibc-package/branches/glibc-2.5/debian: . patches patches/all
Author: aurel32
Date: 2006-10-02 11:55:33 +0000 (Mon, 02 Oct 2006)
New Revision: 1833
Modified:
glibc-package/branches/glibc-2.5/debian/changelog
glibc-package/branches/glibc-2.5/debian/patches/all/submitted-new-brf-encoding.diff
glibc-package/branches/glibc-2.5/debian/patches/series
Log:
* Update all/submitted-new-brf-encoding.diff.
Modified: glibc-package/branches/glibc-2.5/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.5/debian/changelog 2006-10-02 05:11:01 UTC (rev 1832)
+++ glibc-package/branches/glibc-2.5/debian/changelog 2006-10-02 11:55:33 UTC (rev 1833)
@@ -24,8 +24,8 @@
* Remove any/local-ttyname-devfs.diff (devfs is not supported anymore).
* Update arm/local-no-hwcap.diff.
* Update any/local-ldso-disable-hwcap.diff.
+ * Update all/submitted-new-brf-encoding.diff.
* debhelper.in/libc.docs: remove INTERFACE as it has been removed upstream.
- * *Temporarily* disable all/submitted-new-brf-encoding.diff it needs to be ported.
[ Denis Barbier ]
* Remove localedata/locale-en_NZ.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.5/debian/patches/all/submitted-new-brf-encoding.diff
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/all/submitted-new-brf-encoding.diff 2006-10-02 05:11:01 UTC (rev 1832)
+++ glibc-package/branches/glibc-2.5/debian/patches/all/submitted-new-brf-encoding.diff 2006-10-02 11:55:33 UTC (rev 1833)
@@ -10,26 +10,26 @@
IBM1142 IBM1143 IBM1144 IBM1145 IBM1146 IBM1147 IBM1148 \
IBM1149 IBM1166 IBM1167 IBM4517 IBM4899 IBM4909 IBM4971 \
IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804 \
-- IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1
-+ IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 BRF
+- IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK
++ IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF
modules.so := $(addsuffix .so, $(modules))
-@@ -195,7 +195,7 @@
+@@ -196,7 +196,7 @@
ibm9030.c ibm9030.h ibm9066.c ibm9066.h ibm9448.c ibm9448.h \
ibm12712.c ibm12712.h ibm16804.c ibm16804.h \
ibm1364.c ibm1364.h ibm1371.c ibm1371.h ibm1388.c ibm1388.h \
-- ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c
-+ ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c brf.c
+- ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c
++ ibm1390.c ibm1390.h ibm1399.c ibm1399.h iso_11548-1.c mik.c brf.c
# We build the transformation modules only when we build shared libs.
ifeq (yes,$(build-shared))
-@@ -236,7 +236,7 @@
+@@ -237,7 +237,7 @@
iso8859-13 iso8859-14 iso8859-15 mac-uk sami-ws2 \
iso-ir-197 tis-620 koi8-u ibm874 cp10007 koi8-t \
georgian-ps georgian-academy iso-ir-209 mac-sami \
-- iso8859-11 ibm866nav pt154 rk1048
-+ iso8859-11 ibm866nav pt154 rk1048 brf
+- iso8859-11 ibm866nav pt154 rk1048 mik
++ iso8859-11 ibm866nav pt154 rk1048 mik brf
gen-special-modules := iso8859-7jp
@@ -71,10 +71,10 @@
===================================================================
--- iconvdata/gconv-modules.orig
+++ iconvdata/gconv-modules
-@@ -1903,3 +1903,7 @@
- alias ISO11548-1// ISO_11548-1//
- module ISO_11548-1// INTERNAL ISO_11548-1 1
- module INTERNAL ISO_11548-1// ISO_11548-1 1
+@@ -1572,3 +1572,7 @@
+ alias STRK1048-2002// RK1048//
+ module RK1048// INTERNAL RK1048 1
+ module INTERNAL RK1048// RK1048 1
+
+# from to module cost
+module BRF// INTERNAL BRF 1
Modified: glibc-package/branches/glibc-2.5/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-02 05:11:01 UTC (rev 1832)
+++ glibc-package/branches/glibc-2.5/debian/patches/series 2006-10-02 11:55:33 UTC (rev 1833)
@@ -83,7 +83,7 @@
all/local-remove-manual.diff
all/local-ru_RU.diff -p1
all/local-pt_BR.diff -p1
-#all/submitted-new-brf-encoding.diff -p0
+all/submitted-new-brf-encoding.diff -p0
any/local-__thread.diff -p0
any/local-asserth-decls.diff -p0
Reply to: