Author: gotom
Date: 2005-08-22 10:47:56 +0000 (Mon, 22 Aug 2005)
New Revision: 1014
Added:
glibc-package/trunk/debian/patches/glibc235-localedata-locales.dpatch
glibc-package/trunk/debian/patches/glibc235-localedata-sr_CS.dpatch
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/00list
Log:
* debian/patches/glibc235-localedata-sr_CS.dpatch: New file, to fix
sr_CS localedef breakage. (Closes: #322655)
* debian/patches/glibc235-localedata-locales.dpatch: New file, to fix
mn_MN and sid_ET localedef breakage. (Closes: #321634)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-08-22 09:54:18 UTC (rev
1013)
+++ glibc-package/trunk/debian/changelog 2005-08-22 10:47:56 UTC (rev
1014)
@@ -17,6 +17,11 @@
* debian/local/usr_sbin/locale-gen: Don't break locale-gen when locale-def
warns errors.
+ * debian/patches/glibc235-localedata-sr_CS.dpatch: New file, to fix
+ sr_CS localedef breakage. (Closes: #322655)
+ * debian/patches/glibc235-localedata-locales.dpatch: New file, to fix
+ mn_MN and sid_ET localedef breakage. (Closes: #321634)
+
-- GOTO Masanori <[EMAIL PROTECTED]> Sun, 21 Aug 2005 12:33:42 +0900
glibc (2.3.5-4) unstable; urgency=low
Modified: glibc-package/trunk/debian/patches/00list
===================================================================
--- glibc-package/trunk/debian/patches/00list 2005-08-22 09:54:18 UTC (rev
1013)
+++ glibc-package/trunk/debian/patches/00list 2005-08-22 10:47:56 UTC (rev
1014)
@@ -81,3 +81,5 @@
locale-iso4217
glibc235-gcc4-hppa-profile
glibc235-dl-execstack
+glibc235-localedata-sr_CS
+glibc235-localedata-locales
Added: glibc-package/trunk/debian/patches/glibc235-localedata-locales.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-localedata-locales.dpatch
2005-08-22 09:54:18 UTC (rev 1013)
+++ glibc-package/trunk/debian/patches/glibc235-localedata-locales.dpatch
2005-08-22 10:47:56 UTC (rev 1014)
@@ -0,0 +1,93 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Fix mn_MN, sid_ET and vi_VN localedef compilation breakage.
+# DP: Related bugs: #321634: locales: vi_VN locale generation fails for lack
of LC_NAME, LC_ADDRESS, LC_TELEPHONE
+# DP: Dpatch author: GOTO Masanori <[EMAIL PROTECTED]>
+# DP: Patch author: GOTO Masanori <[EMAIL PROTECTED]>
+# DP: Upstream status: Will be submitted
+# DP: Status Details:
+# DP: Date: 2005-08-22
+
+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.
+2005-08-22 GOTO Masanori <[EMAIL PROTECTED]>
+
+ * locales/mn_MN: Fix invalid line separation.
+ * locales/sid_ET: Don't use undefined lang_ab.
+ * locales/vi_VN: Add default LC_NAME, LC_ADDRESS, LC_TELEPHONE.
+
+Index: localedata/locales/mn_MN
+===================================================================
+RCS file: /cvs/glibc/libc/localedata/locales/mn_MN,v
+retrieving revision 1.5
+diff -u -p -r1.5 mn_MN
+--- localedata/locales/mn_MN 22 May 2005 16:20:17 -0000 1.5
++++ localedata/locales/mn_MN 22 Aug 2005 10:13:00 -0000
+@@ -218,8 +218,8 @@ am_pm "";""
+ t_fmt_ampm ""
+ % Full date and time representation
+ % "%Z %Y ony %B %e, %a %H:%M:%S"
+-date_fmt
"<U0025><U005A><U0020><U0025><U0059><U0020><U043E><U043D><U044B><U0020><U0025><U0042><U0020>";/
+-
"<U0025><U0065><U002C><U0020><U0025><U0061><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
++date_fmt
"<U0025><U005A><U0020><U0025><U0059><U0020><U043E><U043D><U044B><U0020><U0025><U0042><U0020>
++<U0025><U0065><U002C><U0020><U0025><U0061><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
+ END LC_TIME
+
+ LC_MESSAGES
+Index: localedata/locales/sid_ET
+===================================================================
+RCS file: /cvs/glibc/libc/localedata/locales/sid_ET,v
+retrieving revision 1.3
+diff -u -p -r1.3 sid_ET
+--- localedata/locales/sid_ET 3 May 2004 20:52:23 -0000 1.3
++++ localedata/locales/sid_ET 22 Aug 2005 10:22:21 -0000
+@@ -113,7 +113,7 @@ country_num 231 % 210 found in at le
+ % country_car unknown
+ % country_isbn unknown, Need ISO 2108
+ lang_name
"<U0053><U0069><U0064><U0061><U0061><U006D><U0075><U0020><U0041><U0066><U006F>"
+-lang_ab "<U0073><U0069><U0064>"
++lang_ab ""
+ lang_term "<U0073><U0069><U0064>"
+ lang_lib "<U0073><U0069><U0064>"
+ %
+Index: localedata/locales/vi_VN
+===================================================================
+RCS file: /cvs/glibc/libc/localedata/locales/vi_VN,v
+retrieving revision 1.7
+diff -u -p -r1.7 vi_VN
+--- localedata/locales/vi_VN 8 Jul 2005 16:19:07 -0000 1.7
++++ localedata/locales/vi_VN 22 Aug 2005 10:44:49 -0000
+@@ -283,6 +283,18 @@ height 297
+ width 210
+ END LC_PAPER
+
++LC_NAME
++copy "i18n"
++END LC_NAME
++
++LC_ADDRESS
++copy "i18n"
++END LC_ADDRESS
++
++LC_TELEPHONE
++copy "i18n"
++END LC_TELEPHONE
++
+ LC_MEASUREMENT
+ measurement 1
+ END LC_MEASUREMENT
Added: glibc-package/trunk/debian/patches/glibc235-localedata-sr_CS.dpatch
===================================================================
--- glibc-package/trunk/debian/patches/glibc235-localedata-sr_CS.dpatch
2005-08-22 09:54:18 UTC (rev 1013)
+++ glibc-package/trunk/debian/patches/glibc235-localedata-sr_CS.dpatch
2005-08-22 10:47:56 UTC (rev 1014)
@@ -0,0 +1,37 @@
+#! /bin/sh -e
+
+# All lines beginning with `# DP:' are a description of the patch.
+# DP: Description: Add "CSD" symbol to iso-4217.def.
+# DP: Related bugs: #322655
+# DP: Dpatch author:
+# DP: Patch author: GOTO Masanori <[EMAIL PROTECTED]>
+# DP: Upstream status: In CVS
+# DP: Status Details:
+# DP: Date: 2005-08-22
+
+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.
+--- locale/iso-4217.def.gotom 2005-08-19 16:14:07.000000000 +0900
++++ locale/iso-4217.def 2005-08-22 19:33:21.909785640 +0900
+@@ -40,6 +40,7 @@
+ DEFINE_INT_CURR("CNY") /* China Yuan Renminbi */
+ DEFINE_INT_CURR("COP") /* Colombian Peso */
+ DEFINE_INT_CURR("CRC") /* Costa Rican Colon */
++DEFINE_INT_CURR("CSD") /* Serbian Dinar */
+ DEFINE_INT_CURR("CUP") /* Cuban Peso */
+ DEFINE_INT_CURR("CVE") /* Cape Verde Escudo */
+ DEFINE_INT_CURR("CYP") /* Cypriot Pound */
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
