I have attached a patch that applied against the tree of glibc, will patch make-cvs-locales-patch.sh so that it will include changes in iso-3166.def (So the new alpha-3 code of Romania gets defined) and iso-639.def (So that the 'byn' language gets defined) into debian/patches/11_cvs_locales.dpatch. The version that includes changes in iso-*.def is commented out because changes in iso-4217.def conflict with other definitions. Also, the CVS version of glibc fixes the ee_ET translation, so my patch also removes that. I've applied and built and the resulting package worked perfectly for all the locales, except sid_ET: sid_ET.UTF-8...LC_ADDRESS: `lang_lib' value does not match `lang_term' value , even though localedata/locales contains: lang_term "<U0073><U0069><U0064>" lang_lib "<U0073><U0069><U0064>" Alas, I can't figure that out since I'm pretty much clueless when it coomes to locales, so I'm going to leave this for somebody more knowledgeable than me. Fact of the matter is, it doesn't actually error out, nor could I get it the sid_ET locale to actually work... Since, for Romanian users, this is a pretty important problem, what with Sarge having the broken version too (I know about snapshot.debian.net, but still) and because sid_ET wasn't in the previous version at all anyway, I hope you will release a fixed version soon. -- George Cristian Birzan gcbirzan (at) sns (dot) ro Furious activity is no substitute for understanding. -- H.H. Williams
diff -u glibc-2.3.2.ds1/debian/make-cvs-locales-patch.sh glibc-2.3.2.ds1/debian/make-cvs-locales-patch.sh
--- glibc-2.3.2.ds1/debian/make-cvs-locales-patch.sh
+++ glibc-2.3.2.ds1/debian/make-cvs-locales-patch.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-
-set -e
-
+#
# This script is designed to help make patches to update from the last
# release to the latest CVS. Hand it the argument of the directory from
# which to generate the diff.
@@ -12,6 +10,8 @@
# This file is in the PUBLIC DOMAIN
# written by Jeff Bailey jbailey@debian.org September 6th, 2002
+ISOLIST='3166 639'
+
if [ $# -ne 1 ]; then
echo "`basename $0`: script expects a CVS tree to diff against"
exit 1
@@ -29,0 +30,11 @@
+for iso in $ISOLIST
+do
+ file=iso-${iso}.def
+ diff -uN $SRCDIR/locale/$file $1/locale/$file
+done >>debian/patches/11_cvs_locales.dpatch
+
+#find $SRCDIR/locale $1/locale -name 'iso-*.def' | sed -r 's@^.*/([^/]+)$@\1@g' | sort -u | while read file
+#do
+# diff -uN $SRCDIR/locale/$file $1/locale/$file
+#done >>debian/patches/11_cvs_locales.dpatch
+
diff -u glibc-2.3.2.ds1/debian/patches/00list glibc-2.3.2.ds1/debian/patches/00list
--- glibc-2.3.2.ds1/debian/patches/00list
+++ glibc-2.3.2.ds1/debian/patches/00list
@@ -94 +93,0 @@
-locale-et_EE
reverted:
--- glibc-2.3.2.ds1/debian/patches/locale-et_EE.dpatch
+++ glibc-2.3.2.ds1.orig/debian/patches/locale-et_EE.dpatch
@@ -1,67 +0,0 @@
-#! /bin/sh -e
-
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: List et_EE with charset ISO-8859-15 as a supported locale
-# DP: Related bugs: #208238
-# DP: Dpatch author: Petter Reinholdtsen
-# DP: Patch author: Petter Reinholdtsen
-# DP: Upstream status: In CVS
-# DP: Status Details: http://sources.redhat.com/bugzilla/show_bug.cgi?id=118
-# DP: Date: 2004-04-18
-
-PATCHLEVEL=0
-
-if [ $# -ne 2 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch -d "$2" -f --no-backup-if-mismatch -p$PATCHLEVEL < $0;;
- -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p$PATCHLEVEL < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-esac
-exit 0
-
-# append the patch here and adjust the -p? flag in the patch calls.
-
-2004-04-17 Petter Reinholdtsen <pere@hungry.com>
-
- * locales/et_EE: Change default charset for et_EE locale from
- ISO-8859-1 to ISO-8859-15, to reflect the content of
- <URL:http://www.eki.ee/itstandard/contents.html>. Based on input
- from Indrek Hein and Meelis Roos.
- * SUPPORTED: Add et_EE.ISO-8859-15.
-
-Index: localedata/SUPPORTED
-===================================================================
-RCS file: /cvs/glibc/libc/localedata/SUPPORTED,v
-retrieving revision 1.68
-diff -u -3 -p -u -r1.68 SUPPORTED
---- localedata/SUPPORTED 19 Jan 2004 23:51:37 -0000 1.68
-+++ localedata/SUPPORTED 17 Apr 2004 18:10:04 -0000
-@@ -161,6 +161,7 @@
- es_VE/ISO-8859-1 \
- et_EE.UTF-8/UTF-8 \
- et_EE/ISO-8859-1 \
-+et_EE.ISO-8859-15/ISO-8859-15 \
- eu_ES.UTF-8/UTF-8 \
- eu_ES.UTF-8@euro/UTF-8 \
- eu_ES/ISO-8859-1 \
-Index: localedata/locales/et_EE
-===================================================================
-RCS file: /cvs/glibc/libc/localedata/locales/et_EE,v
-retrieving revision 1.11
-diff -u -3 -p -u -r1.11 et_EE
---- localedata/locales/et_EE 6 Dec 2003 07:40:37 -0000 1.11
-+++ localedata/locales/et_EE 17 Apr 2004 18:10:05 -0000
-@@ -17,7 +17,7 @@ comment_char %
- % Application: general
- % Users: general
- % Repertoiremap: mnemonic.ds
--% Charset: ISO-8859-1
-+% Charset: ISO-8859-15
- % Distribution and use is free, also
- % for commercial purposes.
-
Attachment:
signature.asc
Description: Digital signature