r1778 - in glibc-package/trunk/debian: . patches/localedata
Author: barbier
Date: 2006-08-24 00:44:36 +0000 (Thu, 24 Aug 2006)
New Revision: 1778
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/localedata/reverted-for-etch.diff
Log:
Remove from /usr/share/doc/locales/changelog.gz upstream changes which
have been put in localedata/reverted-for-etch.diff.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-08-24 00:21:56 UTC (rev 1777)
+++ glibc-package/trunk/debian/changelog 2006-08-24 00:44:36 UTC (rev 1778)
@@ -1,12 +1,17 @@
glibc (2.3.6.ds1-4) unstable; urgency=low
+ [ Aurelien Jarno ]
* debian/control.in/opt: add a new line at the end of the file. (Closes:
- #384375).
+ #384375).
* debian/rules.d/control.mk: add a check to make sur that all files in
debian/control.in have a new line at the end.
- -- Aurelien Jarno <aurel32@debian.org> Thu, 24 Aug 2006 00:21:25 +0200
+ [ Denis Barbier ]
+ * Remove from /usr/share/doc/locales/changelog.gz upstream changes which
+ have been put in localedata/reverted-for-etch.diff.
+ -- Denis Barbier <barbier@debian.org> Thu, 24 Aug 2006 02:44:00 +0200
+
glibc (2.3.6.ds1-3) unstable; urgency=low
* patches/any/cvs-sysctl.diff: patch from upstream to fix the sysctl()
Modified: glibc-package/trunk/debian/patches/localedata/reverted-for-etch.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/reverted-for-etch.diff 2006-08-24 00:21:56 UTC (rev 1777)
+++ glibc-package/trunk/debian/patches/localedata/reverted-for-etch.diff 2006-08-24 00:44:36 UTC (rev 1778)
@@ -1,9 +1,11 @@
Release managers asked for these changes to be postponed after etch,
to make sure that they do not break applications.
---- glibc-2.3.6/localedata/locales/ru_RU 2006-08-16 22:13:16.252898592 +0200
-+++ glibc-2.3.6/localedata/locales/ru_RU 2006-08-16 22:15:58.191932150 +0200
-@@ -81,7 +77,7 @@
+Index: glibc-2.3.6/localedata/locales/ru_RU
+===================================================================
+--- glibc-2.3.6.orig/localedata/locales/ru_RU
++++ glibc-2.3.6/localedata/locales/ru_RU
+@@ -81,7 +81,7 @@
int_curr_symbol "<U0052><U0055><U0042><U0020>"
currency_symbol "<U0440><U0443><U0431>"
mon_decimal_point "<U002E>"
@@ -12,7 +14,7 @@
mon_grouping 3;3
positive_sign ""
negative_sign "<U002D>"
-@@ -97,7 +93,7 @@
+@@ -97,7 +97,7 @@
LC_NUMERIC
decimal_point "<U002C>"
@@ -21,9 +23,11 @@
grouping 3;3
END LC_NUMERIC
---- glibc-2.3.6/localedata/locales/vi_VN 2006-08-16 22:13:16.258897444 +0200
-+++ glibc-2.3.6/localedata/locales/vi_VN 2006-08-16 22:11:40.483211943 +0200
-@@ -235,8 +233,8 @@
+Index: glibc-2.3.6/localedata/locales/vi_VN
+===================================================================
+--- glibc-2.3.6.orig/localedata/locales/vi_VN
++++ glibc-2.3.6/localedata/locales/vi_VN
+@@ -235,8 +235,8 @@
mon_grouping 3;3
positive_sign ""
negative_sign "<U002D>"
@@ -34,7 +38,7 @@
p_cs_precedes 0
p_sep_by_space 0
n_cs_precedes 1
-@@ -266,19 +264,19 @@
+@@ -266,19 +266,19 @@
"<U0054><U0068><U1EE9><U0020><U006E><U0103><U006D>";/
"<U0054><U0068><U1EE9><U0020><U0073><U00E1><U0075>";/
"<U0054><U0068><U1EE9><U0020><U0062><U1EA3><U0079>"
@@ -64,7 +68,7 @@
"<U0054><U0068><U00E1><U006E><U0067><U0020><U0068><U0061><U0069>";/
"<U0054><U0068><U00E1><U006E><U0067><U0020><U0062><U0061>";/
"<U0054><U0068><U00E1><U006E><U0067><U0020><U0074><U01B0>";/
-@@ -288,12 +286,12 @@
+@@ -288,12 +288,12 @@
"<U0054><U0068><U00E1><U006E><U0067><U0020><U0074><U00E1><U006D>";/
"<U0054><U0068><U00E1><U006E><U0067><U0020><U0063><U0068><U00ED><U006E>";/
"<U0054><U0068><U00E1><U006E><U0067><U0020><U006D><U01B0><U1EDD><U0069>";/
@@ -81,7 +85,7 @@
t_fmt_ampm "<U0025><U0049><U003A><U0025><U004D><U0020><U0025><U0070>"
date_fmt "<U0025><U0041><U002C><U0020><U0025><U0064><U0020><U0025><U0042><U0020><U006E><U0103><U006D><U0020><U0025><U0059><U0020><U0025><U0054><U0020><U0025><U005A>"
% FIXME: found in CLDR
-@@ -319,7 +317,7 @@
+@@ -319,7 +319,7 @@
% LC_NAME category.
%
name_fmt "<U0025><U0070><U0025><U0074><U0025><U0066><U0025><U0074>/
@@ -90,8 +94,33 @@
name_gen ""
name_mr "<U00D4><U002E>"
name_mrs "<U0042><U002E>"
-@@ -356,3 +354,4 @@
+@@ -356,3 +356,4 @@
LC_MEASUREMENT
measurement 1
END LC_MEASUREMENT
+
+Index: glibc-2.3.6/localedata/ChangeLog
+===================================================================
+--- glibc-2.3.6.orig/localedata/ChangeLog
++++ glibc-2.3.6/localedata/ChangeLog
+@@ -264,9 +264,6 @@
+ [BZ #388]
+ * locales/pl_PL: Don't ignore U0020 in collation.
+
+- [BZ #352]
+- * locales/ru_RU: Use U2002 for thousands_sep and mon_throusands_sep.
+-
+ 2006-05-01 Alexander Shopov <ash@contact.bg>
+
+ [BZ #2625]
+@@ -305,10 +302,6 @@
+ * locales/pa_PK: New file.
+ * SUPPORTED: Add pa_PK.UTF-8.
+
+- [BZ #1974]
+- * locales/vi_VN: Fix int_frac_digits/frac_digits, abmon, mon, d_t_fmt,
+- am_pm, and name_fmt.
+-
+ [BZ #1787]
+ * locales/en_ZA: Updates.
+
Reply to: