r4706 - in glibc-package/trunk/debian: . patches patches/localedata
Author: aurel32
Date: 2011-06-04 16:15:32 +0000 (Sat, 04 Jun 2011)
New Revision: 4706
Removed:
glibc-package/trunk/debian/patches/localedata/locale-sv_SE.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff
glibc-package/trunk/debian/patches/series
Log:
Merge patches/localedata/locale-sv_SE.diff into patches/localedata/submitted-bz9725-locale-sv_SE.diff
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-06-04 15:45:05 UTC (rev 4705)
+++ glibc-package/trunk/debian/changelog 2011-06-04 16:15:32 UTC (rev 4706)
@@ -40,8 +40,8 @@
* Add a loongson2f optimized library. Closes: #601419.
* Update local/manpages/ld.so.8 with hardware capabilities documentation.
Closes: #622385.
- * Add patches/localedata/locale-sv_SE.diff to fix time format in sv_SE
- locale. Closes: #604125.
+ * Update patches/localedata/submitted-bz9725-locale-sv_SE.diff to fix time
+ format in sv_SE locale. Closes: #604125.
* Add patches/mips/submitted-wordsize-clang.diff to make clang usable on
mips/mipsel. Closes: #601645.
* Add patches/any/submitted-mqueue-throw.diff to fix different declarations
Deleted: glibc-package/trunk/debian/patches/localedata/locale-sv_SE.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/locale-sv_SE.diff 2011-06-04 15:45:05 UTC (rev 4705)
+++ glibc-package/trunk/debian/patches/localedata/locale-sv_SE.diff 2011-06-04 16:15:32 UTC (rev 4706)
@@ -1,21 +0,0 @@
-2011-06-04 Aurelien Jarno <aurelien@aurel32.net>
-
- * locales/sv_SE (LC_TIME): Fix d_t_fmt and t_fmt.
-
-diff --git a/localedata/locales/sv_SE b/localedata/locales/sv_SE
-index f558e24..2dbc853 100644
---- a/localedata/locales/sv_SE
-+++ b/localedata/locales/sv_SE
-@@ -169,9 +169,9 @@ mon "<U006A><U0061><U006E><U0075><U0061><U0072><U0069>";/
- "<U006F><U006B><U0074><U006F><U0062><U0065><U0072>";/
- "<U006E><U006F><U0076><U0065><U006D><U0062><U0065><U0072>";/
- "<U0064><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
--d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
-+d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
- d_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
--t_fmt "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
-+t_fmt "<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
- am_pm "";""
- t_fmt_ampm ""
- date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-
Modified: glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff 2011-06-04 15:45:05 UTC (rev 4705)
+++ glibc-package/trunk/debian/patches/localedata/submitted-bz9725-locale-sv_SE.diff 2011-06-04 16:15:32 UTC (rev 4706)
@@ -10,23 +10,25 @@
"<U0064><U0065><U0063><U0065><U006D><U0062><U0065><U0072>"
+%
+% Appropriate date and time representation (%c)
-+% "%a %e %b %Y %H.%M.%S"
- d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
++% "%a %e %b %Y %H:%M:%S"
+-d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
++d_t_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062><U0020><U0025><U0059><U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
+%
+% Appropriate date representation (%x) "%Y-%m-%d"
d_fmt "<U0025><U0059><U002D><U0025><U006D><U002D><U0025><U0064>"
+%
-+% Appropriate time representation (%X) "%H.%M.%S"
- t_fmt "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
++% Appropriate time representation (%X) "%H:%M:%S"
+-t_fmt "<U0025><U0048><U002E><U0025><U004D><U002E><U0025><U0053>"
++t_fmt "<U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053>"
am_pm "";""
t_fmt_ampm ""
-date_fmt "<U0025><U0061><U0020><U0025><U0062><U0020><U0025><U0065>/
-<U0020><U0025><U0048><U003A><U0025><U004D><U003A><U0025><U0053><U0020>/
-<U0025><U005A><U0020><U0025><U0059>"
+%
-+% Appropriate date representation (date(1)) "%a %e %b %Y %H.%M.%S %Z"
++% Appropriate date representation (date(1)) "%a %e %b %Y %H:%M:%S %Z"
+date_fmt "<U0025><U0061><U0020><U0025><U0065><U0020><U0025><U0062>/
-+<U0020><U0025><U0059><U0020><U0025><U0048><U002E><U0025><U004D><U002E>/
++<U0020><U0025><U0059><U0020><U0025><U0048><U003A><U0025><U004D><U003A>/
+<U0025><U0053><U0020><U0025><U005A>"
first_weekday 2
first_workday 2
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2011-06-04 15:45:05 UTC (rev 4705)
+++ glibc-package/trunk/debian/patches/series 2011-06-04 16:15:32 UTC (rev 4706)
@@ -44,7 +44,6 @@
localedata/locale-ff_SN.diff
localedata/locale-sw.diff
localedata/locale-sv_FI.diff
-localedata/locale-sv_SE.diff
alpha/local-gcc4.1.diff
alpha/submitted-creat64.diff
Reply to: