Author: barbier
Date: 2006-07-19 21:55:10 +0000 (Wed, 19 Jul 2006)
New Revision: 1675
Added:
glibc-package/trunk/debian/debhelper.in/locales-all.postinst
Removed:
glibc-package/trunk/debian/locales-all.README.Debian
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Let locales-all ship a /usr/lib/locales-all/supported.tar.gz
compressed archive to save disk space. Compiled locales are now
copied into /usr/lib/locale/locale-archive by locales-all.postinst,
so this package is fully functional. (Closes: #375829)
Thanks Javier Serrano Polo
* debian/locales-all.README.Debian: File removed, it is useless now.
(Closes: #378191)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-07-05 21:14:26 UTC (rev
1674)
+++ glibc-package/trunk/debian/changelog 2006-07-19 21:55:10 UTC (rev
1675)
@@ -32,6 +32,13 @@
* debian/debhelper.in/libc.postinst: Call iconvconfig to generate
/usr/lib/gconv/gconv-modules.cache. (Closes: #376811)
* debian/debhelper.in/libc.postrm: Remove this cache file.
+ * Let locales-all ship a /usr/lib/locales-all/supported.tar.gz
+ compressed archive to save disk space. Compiled locales are now
+ copied into /usr/lib/locale/locale-archive by locales-all.postinst,
+ so this package is fully functional. (Closes: #375829)
+ Thanks Javier Serrano Polo
+ * debian/locales-all.README.Debian: File removed, it is useless now.
+ (Closes: #378191)
-- Aurelien Jarno <[EMAIL PROTECTED]> Thu, 8 Jun 2006 08:03:49 +0200
Added: glibc-package/trunk/debian/debhelper.in/locales-all.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.postinst
2006-07-05 21:14:26 UTC (rev 1674)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.postinst
2006-07-19 21:55:10 UTC (rev 1675)
@@ -0,0 +1,16 @@
+#!/bin/sh
+set -e
+export LC_ALL=C
+
+if [ "$1" = "configure" ]; then
+ [ -d /usr/lib/locale ] || mkdir /usr/lib/locale
+ tmpdir=$(mktemp -d /tmp/locales.XXXXXXXXXX)
+ tar zxf /usr/lib/locales-all/supported.tar.gz -C "$tmpdir"
+ localedef --add-to-archive "$tmpdir"/*
+ rm -rf "$tmpdir"
+fi
+
+#DEBHELPER#
+
+exit 0
+
Deleted: glibc-package/trunk/debian/locales-all.README.Debian
===================================================================
--- glibc-package/trunk/debian/locales-all.README.Debian 2006-07-05
21:14:26 UTC (rev 1674)
+++ glibc-package/trunk/debian/locales-all.README.Debian 2006-07-19
21:55:10 UTC (rev 1675)
@@ -1,14 +0,0 @@
-The locales-all package contains precompiled locale files.
-They cannot be put under /usr/lib/locale, otherwise they would
-interfere with the locales package and could be removed by
-locale-gen. They are shipped in /usr/lib/locales-all, and
-there are two solutions to make use of them:
- 1. Either set LOCPATH=/usr/lib/locales-all in your environment,
- for instance by running (as root)
- update-locale LOCPATH=/usr/lib/locales-all
- 2. Or copy locale definitions into /usr/lib/locale/locale-archive
- by running
- localedef --add-to-archive /usr/lib/locales-all/*
- But the locales package will overwrite /usr/lib/locale/locale-archive
- so this solution works well only if the locales package is not
- installed.
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-07-05 21:14:26 UTC (rev
1674)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-07-19 21:55:10 UTC (rev
1675)
@@ -118,8 +118,8 @@
objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass)
\
localedata/install-locales; \
rm -rf $(CURDIR)/debian/locales-all/usr/lib; \
- install -d $(CURDIR)/debian/locales-all/usr/lib; \
- mv $(CURDIR)/debian/tmp-libc/usr/lib/locale
$(CURDIR)/debian/locales-all/usr/lib/locales-all; \
+ install -d $(CURDIR)/debian/locales-all/usr/lib/locales-all; \
+ tar zcf
$(CURDIR)/debian/locales-all/usr/lib/locales-all/supported.tar.gz -C
$(CURDIR)/debian/tmp-libc/usr/lib/locale .; \
(cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
fi
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
