r3501 - in glibc-package/branches/eglibc-2.10/debian: . bug/locales debhelper.in local/manpages patches/localedata sysdeps
Author: aurel32
Date: 2009-05-14 21:01:05 +0000 (Thu, 14 May 2009)
New Revision: 3501
Modified:
glibc-package/branches/eglibc-2.10/debian/bug/locales/presubj
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/debhelper.in/locales.config
glibc-package/branches/eglibc-2.10/debian/local/manpages/validlocale.8
glibc-package/branches/eglibc-2.10/debian/patches/localedata/supported.diff
glibc-package/branches/eglibc-2.10/debian/sysdeps/ia64.mk
Log:
merge from trunk, revisions 3467-3500
Modified: glibc-package/branches/eglibc-2.10/debian/bug/locales/presubj
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/bug/locales/presubj 2009-05-14 20:22:16 UTC (rev 3500)
+++ glibc-package/branches/eglibc-2.10/debian/bug/locales/presubj 2009-05-14 21:01:05 UTC (rev 3501)
@@ -13,6 +13,6 @@
If it's not, it is very likely that the corresponding libc has not been
built _and_ uploaded to the mirrors for your architecture yet, and that the
dependencies will be fixed soon. Please wait for the package to be installed
- for more than 24 hours before reporting abug about `locales` dependencies.
+ for more than 24 hours before reporting a bug about `locales` dependencies.
[1] http://buildd.debian.org/~jeroen/status/package.php?p=glibc
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-14 20:22:16 UTC (rev 3500)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-05-14 21:01:05 UTC (rev 3501)
@@ -76,8 +76,14 @@
and nscd is not running to comply with LSB. Closes: #527883.
* debian/debhelper.in/locales.config: don't use "echo -e". Closes:
#527945.
+ * debian/patches/localedata/supported.diff: add kk_KZ.RK1048 locale.
+ Closes: #528177.
+ * debian/debhelper.in/locales.config: use previous debconf settings if
+ /etc/environment and /etc/default/locale do not exist.
+ * debian/bug/locales/presubj: fix a typo. Closes: #528353.
+ * debian/local/manpages/validlocale.8: fix a typo. Closes #528658.
- -- Aurelien Jarno <aurel32@debian.org> Sat, 09 May 2009 20:56:18 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Thu, 14 May 2009 21:25:26 +0200
eglibc (2.9-12) unstable; urgency=low
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/locales.config 2009-05-14 20:22:16 UTC (rev 3500)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/locales.config 2009-05-14 21:01:05 UTC (rev 3501)
@@ -48,12 +48,11 @@
db_set locales/locales_to_be_generated "$SELECTED_LOCALES"
fi
-DEFAULT_ENVIRONMENT="$(cat /etc/environment /etc/default/locale 2>/dev/null | awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')"
+DEFAULT_ENVIRONMENT="$(cat /etc/environment /etc/default/locale 2>/dev/null | awk '/^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')"
DEFAULT_ENVIRONMENT="$(convert_locale "$DEFAULT_ENVIRONMENT")"
if ! echo "$SUPPORTED_LOCALES" | grep -q -e "\b$DEFAULT_ENVIRONMENT\b" ; then
- DEFAULT_ENVIRONMENT="None"
+ db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
fi
-db_set locales/default_environment_locale "$DEFAULT_ENVIRONMENT"
STATE=1
while [ "$STATE" -ge 0 ]; do
Modified: glibc-package/branches/eglibc-2.10/debian/local/manpages/validlocale.8
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/local/manpages/validlocale.8 2009-05-14 20:22:16 UTC (rev 3500)
+++ glibc-package/branches/eglibc-2.10/debian/local/manpages/validlocale.8 2009-05-14 21:01:05 UTC (rev 3501)
@@ -38,9 +38,9 @@
.IP
% validlocale de_AU@euro
.br
-locale 'de_AT@euro' not available
+locale 'de_AU@euro' not available
.br
-de_AT@euro ISO\-8859\-15
+de_AU@euro ISO\-8859\-15
.SH "AUTHORS"
.LP
Petter Reinholdtsen <pere@hungry.com>
Modified: glibc-package/branches/eglibc-2.10/debian/patches/localedata/supported.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/localedata/supported.diff 2009-05-14 20:22:16 UTC (rev 3500)
+++ glibc-package/branches/eglibc-2.10/debian/patches/localedata/supported.diff 2009-05-14 21:01:05 UTC (rev 3501)
@@ -31,6 +31,14 @@
en_ZA.UTF-8/UTF-8 \
en_ZA/ISO-8859-1 \
en_ZW.UTF-8/UTF-8 \
+@@ -252,6 +254,7 @@ ka_GE.UTF-8/UTF-8 \
+ ka_GE/GEORGIAN-PS \
+ kk_KZ.UTF-8/UTF-8 \
+ kk_KZ/PT154 \
++kk_KZ RK1048 \
+ kl_GL.UTF-8/UTF-8 \
+ kl_GL/ISO-8859-1 \
+ km_KH/UTF-8 \
@@ -326,6 +328,7 @@
ru_RU.UTF-8/UTF-8 \
ru_RU.KOI8-R/KOI8-R \
Modified: glibc-package/branches/eglibc-2.10/debian/sysdeps/ia64.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/sysdeps/ia64.mk 2009-05-14 20:22:16 UTC (rev 3500)
+++ glibc-package/branches/eglibc-2.10/debian/sysdeps/ia64.mk 2009-05-14 21:01:05 UTC (rev 3501)
@@ -1,6 +1 @@
-ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH))
-CC = gcc-4.3
-CXX = g++-4.3
-endif
-
libc = libc6.1
Reply to: