r2540 - in glibc-package/trunk/debian: . debhelper.in patches patches/all
Author: aurel32
Date: 2007-09-09 14:59:48 +0000 (Sun, 09 Sep 2007)
New Revision: 2540
Added:
glibc-package/trunk/debian/debhelper.in/locales.links
glibc-package/trunk/debian/patches/all/local-alias-UTF-8.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/locales.install
glibc-package/trunk/debian/patches/series
Log:
* patches/all/local-alias-UTF-8.diff: encode locales.alias in UTF-8.
Closes: bug#404433.
* debhelper.in/locales.links, debhelper.in/locales.install: move
locales.alias into /etc and provide a symlink in
/usr/share/locale/locale.alias.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-09-09 13:56:16 UTC (rev 2539)
+++ glibc-package/trunk/debian/changelog 2007-09-09 14:59:48 UTC (rev 2540)
@@ -8,8 +8,13 @@
to workaround a dpkg-shlibdeps bug. Closes: bug#433723.
* debian/local/manpages/nscd.conf.5: document the persistent and shared
cache options. Closes: bug#338504.
+ * patches/all/local-alias-UTF-8.diff: encode locales.alias in UTF-8.
+ Closes: bug#404433.
+ * debhelper.in/locales.links, debhelper.in/locales.install: move
+ locales.alias into /etc and provide a symlink in
+ /usr/share/locale/locale.alias.
- -- Aurelien Jarno <aurel32@debian.org> Sun, 9 Sep 2007 15:55:17 +0200
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 9 Sep 2007 16:56:56 +0200
glibc (2.6.1-2) unstable; urgency=low
Modified: glibc-package/trunk/debian/debhelper.in/locales.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.install 2007-09-09 13:56:16 UTC (rev 2539)
+++ glibc-package/trunk/debian/debhelper.in/locales.install 2007-09-09 14:59:48 UTC (rev 2540)
@@ -1,6 +1,6 @@
debian/tmp-libc/usr/share/locale/[a-z][a-z] usr/share/locale
debian/tmp-libc/usr/share/locale/[a-z][a-z]_[A-Z][A-Z] usr/share/locale
-debian/tmp-libc/usr/share/locale/locale.alias usr/share/locale
+debian/tmp-libc/usr/share/locale/locale.alias /etc
debian/tmp-libc/usr/share/i18n/* usr/share/i18n
debian/local/usr_sbin/locale-gen usr/sbin
debian/local/usr_sbin/update-locale usr/sbin
Added: glibc-package/trunk/debian/debhelper.in/locales.links
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.links (rev 0)
+++ glibc-package/trunk/debian/debhelper.in/locales.links 2007-09-09 14:59:48 UTC (rev 2540)
@@ -0,0 +1 @@
+etc/locale.alias usr/share/locale/locale.alias
Added: glibc-package/trunk/debian/patches/all/local-alias-UTF-8.diff
===================================================================
--- glibc-package/trunk/debian/patches/all/local-alias-UTF-8.diff (rev 0)
+++ glibc-package/trunk/debian/patches/all/local-alias-UTF-8.diff 2007-09-09 14:59:48 UTC (rev 2540)
@@ -0,0 +1,20 @@
+--- libc/intl/locale.alias
++++ libc/intl/locale.alias
+@@ -27,7 +27,7 @@
+ # bugs@gnu.org.
+
+ bokmal nb_NO.ISO-8859-1
+-bokm� nb_NO.ISO-8859-1
++bokmål nb_NO.ISO-8859-1
+ catalan ca_ES.ISO-8859-1
+ croatian hr_HR.ISO-8859-2
+ czech cs_CZ.ISO-8859-2
+@@ -38,7 +38,7 @@
+ eesti et_EE.ISO-8859-1
+ estonian et_EE.ISO-8859-1
+ finnish fi_FI.ISO-8859-1
+-fran�s fr_FR.ISO-8859-1
++français fr_FR.ISO-8859-1
+ french fr_FR.ISO-8859-1
+ galego gl_ES.ISO-8859-1
+ galician gl_ES.ISO-8859-1
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2007-09-09 13:56:16 UTC (rev 2539)
+++ glibc-package/trunk/debian/patches/series 2007-09-09 14:59:48 UTC (rev 2540)
@@ -98,6 +98,7 @@
sparc/local-undefined-registers.diff -p0
#sparc/submitted-timing.diff
+all/local-alias-UTF-8.diff
all/local-pthread-manpages.diff
all/local-remove-manual.diff
all/local-ru_RU.diff
Reply to: