r897 - in glibc-package/branches/glibc-2.3.4/debian: . debhelper.in local/manpages local/usr_sbin
Author: gotom
Date: 2005-04-21 11:36:31 +0000 (Thu, 21 Apr 2005)
New Revision: 897
Removed:
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.links
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.install
glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.manpages
glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale-gen.8
glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale.gen.5
glibc-package/branches/glibc-2.3.4/debian/local/usr_sbin/locale-gen
Log:
* Start glibc 2.3.5-2.
* Move /etc/locale.alias to /usr/share/locale/locale.alias.
Don't install locale.alias.5. (Closes: #144670, #185991, #298784)
- debian/local/usr_sbin/locale-gen: Use /usr/share/locale/locale.alias
instead of /etc/locale.alias.
- debian/local/manpages/locale-gen.8: Delete reference to
locale.alias.5.
- debian/local/manpages/locale.gen.5: Likewise.
- debian/debhelper.in/locales.links: Removed file, don't link to /etc.
- debian/debhelper.in/locales.install: Install locale.alias under
/usr/share/locale, not /etc/.
- debian/debhelper.in/locales.manpages: Don't install locale.alias.5
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-04-21 11:36:31 UTC (rev 897)
@@ -1,3 +1,21 @@
+glibc (2.3.5-2) experimental; urgency=low
+
+ * GOTO Masanori <gotom@debian.org>
+
+ * Move /etc/locale.alias to /usr/share/locale/locale.alias.
+ Don't install locale.alias.5. (Closes: #144670, #185991, #298784)
+ - debian/local/usr_sbin/locale-gen: Use /usr/share/locale/locale.alias
+ instead of /etc/locale.alias.
+ - debian/local/manpages/locale-gen.8: Delete reference to
+ locale.alias.5.
+ - debian/local/manpages/locale.gen.5: Likewise.
+ - debian/debhelper.in/locales.links: Removed file, don't link to /etc.
+ - debian/debhelper.in/locales.install: Install locale.alias under
+ /usr/share/locale, not /etc/.
+ - debian/debhelper.in/locales.manpages: Don't install locale.alias.5
+
+ -- GOTO Masanori <gotom@debian.org> Thu, 21 Apr 2005 16:52:36 +0900
+
glibc (2.3.5-1) experimental; urgency=low
* GOTO Masanori <gotom@debian.org>
Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.install
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.install 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.install 2005-04-21 11:36:31 UTC (rev 897)
@@ -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 etc
+debian/tmp-libc/usr/share/locale/locale.alias usr/share/locale
debian/tmp-libc/usr/share/i18n/* usr/share/i18n
debian/local/usr_sbin/locale-gen usr/sbin
DEB_SRCDIR/localedata/README usr/share/doc/locales
Deleted: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.links
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.links 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.links 2005-04-21 11:36:31 UTC (rev 897)
@@ -1,2 +0,0 @@
-etc/locale.alias usr/share/locale/locale.alias
-
Modified: glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.manpages
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.manpages 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/debhelper.in/locales.manpages 2005-04-21 11:36:31 UTC (rev 897)
@@ -1,3 +1,2 @@
debian/local/manpages/locale-gen.8
-debian/local/manpages/locale.alias.5
debian/local/manpages/locale.gen.5
Modified: glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale-gen.8
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale-gen.8 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale-gen.8 2005-04-21 11:36:31 UTC (rev 897)
@@ -88,7 +88,7 @@
.SH "SEE ALSO"
.PP
-localedef (1), locale (1), locale.alias (5), locale.gen (5).
+localedef (1), locale (1), locale.gen (5).
.SH "AUTHOR"
.PP
This manual page was written by Eduard Bloch <blade@debian.org> for
Modified: glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale.gen.5
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale.gen.5 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/local/manpages/locale.gen.5 2005-04-21 11:36:31 UTC (rev 897)
@@ -36,6 +36,6 @@
\fB/usr/lib/locale\fP.
.SH "SEE ALSO"
-locale-gen(8), localedef(1), locale(1), locale.alias(5)
+locale-gen(8), localedef(1), locale(1)
.SH "AUTHOR"
Alastair McKinstry <mckinstry@computer.org>
Modified: glibc-package/branches/glibc-2.3.4/debian/local/usr_sbin/locale-gen
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/local/usr_sbin/locale-gen 2005-04-18 01:54:51 UTC (rev 896)
+++ glibc-package/branches/glibc-2.3.4/debian/local/usr_sbin/locale-gen 2005-04-21 11:36:31 UTC (rev 897)
@@ -36,7 +36,7 @@
echo -n '...'; \
if [ -f $LOCALES/$locale ]; then input=$locale; else \
input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
- localedef -i $input -c -f $charset -A /etc/locale.alias $locale; \
+ localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
echo ' done'; \
done < $LOCALEGEN
echo "Generation complete."
Reply to: