r1417 - in glibc-package/trunk/debian: . control.in debhelper.in patches patches/localedata rules.d
Author: barbier
Date: 2006-04-11 23:26:45 +0000 (Tue, 11 Apr 2006)
New Revision: 1417
Added:
glibc-package/trunk/debian/debhelper.in/locales-all.dirs
glibc-package/trunk/debian/debhelper.in/locales-all.install
glibc-package/trunk/debian/patches/localedata/local-all-no-archive.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/patches/series
glibc-package/trunk/debian/rules
glibc-package/trunk/debian/rules.d/build.mk
Log:
Ship a new locales-all package with all supported locales precompiled.
Both locales and locales-all packages provide a virtual generated-locales
package. Packages which currently depends on locales should instead
depend on 'locales | generated-locales'. (Closes: #308020)
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/changelog 2006-04-11 23:26:45 UTC (rev 1417)
@@ -20,8 +20,12 @@
* Do no more transfer variables from /etc/environment to /etc/default/locale
in locales.postinst, but instead add /usr/share/doc/locales/NEWS.Debian
to explain that /etc/environment needs to be cleaned up.
+ * Ship a new locales-all package with all supported locales precompiled.
+ Both locales and locales-all packages provide a virtual generated-locales
+ package. Packages which currently depends on locales should instead
+ depend on 'locales | generated-locales'. (Closes: #308020)
- -- Denis Barbier <barbier@debian.org> Wed, 12 Apr 2006 00:50:32 +0200
+ -- Denis Barbier <barbier@debian.org> Wed, 12 Apr 2006 01:16:51 +0200
glibc (2.3.6-6) unstable; urgency=low
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/control 2006-04-11 23:26:45 UTC (rev 1417)
@@ -34,6 +34,7 @@
Depends: ${locale:Depends}, debconf | debconf-2.0
Conflicts: base-config
Replaces: base-config
+Provides: generated-locales
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
C library for localization (l10n) and internationalization (i18n) support.
@@ -44,6 +45,18 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
+Package: locales-all
+Architecture: any
+Section: libs
+Priority: extra
+Depends: ${locale:Depends}
+Provides: generated-locales
+Description: GNU C Library: Precompiled locale data
+ This package contains the precompiled locale data for all supported locales.
+ A better alternative is to install the locales package and only select
+ desired locales, but it can be useful on a low-memory machine because some
+ locale files take a lot of memory to be compiled.
+
Package: nscd
Architecture: alpha amd64 arm armeb i386 m68k mips mipsel powerpc ppc64 sparc ia64 hppa s390 sh3 sh4 sh3eb sh4eb kfreebsd-i386 kfreebsd-amd64
Section: admin
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/control.in/main 2006-04-11 23:26:45 UTC (rev 1417)
@@ -34,6 +34,7 @@
Depends: ${locale:Depends}, debconf | debconf-2.0
Conflicts: base-config
Replaces: base-config
+Provides: generated-locales
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
C library for localization (l10n) and internationalization (i18n) support.
@@ -44,6 +45,18 @@
savings over how this package used to be, where all locales were generated
by default. This created a package that unpacked to an excess of 30 megs.
+Package: locales-all
+Architecture: any
+Section: libs
+Priority: extra
+Depends: ${locale:Depends}
+Provides: generated-locales
+Description: GNU C Library: Precompiled locale data
+ This package contains the precompiled locale data for all supported locales.
+ A better alternative is to install the locales package and only select
+ desired locales, but it can be useful on a low-memory machine because some
+ locale files take a lot of memory to be compiled.
+
Package: nscd
Architecture: @threads_archs@
Section: admin
Added: glibc-package/trunk/debian/debhelper.in/locales-all.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.dirs 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.dirs 2006-04-11 23:26:45 UTC (rev 1417)
@@ -0,0 +1 @@
+usr/lib/locales-all
Added: glibc-package/trunk/debian/debhelper.in/locales-all.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.install 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.install 2006-04-11 23:26:45 UTC (rev 1417)
@@ -0,0 +1 @@
+debian/tmp-libc/usr/lib/locale usr/lib/locales-all
Added: glibc-package/trunk/debian/patches/localedata/local-all-no-archive.diff
===================================================================
--- glibc-package/trunk/debian/patches/localedata/local-all-no-archive.diff 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/patches/localedata/local-all-no-archive.diff 2006-04-11 23:26:45 UTC (rev 1417)
@@ -0,0 +1,13 @@
+Index: glibc-2.3.6/localedata/Makefile
+===================================================================
+--- glibc-2.3.6.orig/localedata/Makefile
++++ glibc-2.3.6/localedata/Makefile
+@@ -221,7 +221,7 @@
+ echo -n `echo $$locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
+ echo -n '...'; \
+ input=`echo $$locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; \
+- $(LOCALEDEF) --alias-file=../intl/locale.alias \
++ $(LOCALEDEF) --alias-file=../intl/locale.alias --no-archive \
+ -i locales/$$input -c -f charmaps/$$charset \
+ $(addprefix --prefix=,$(install_root)) $$locale; \
+ echo ' done'; \
Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/patches/series 2006-04-11 23:26:45 UTC (rev 1417)
@@ -42,6 +42,7 @@
localedata/fix-unknown-symbols.diff
localedata/first_weekday.diff -p0
localedata/sort-UTF8-first.diff -p0
+localedata/local-all-no-archive.diff
#alpha/submitted-pic.diff -p0 # g: suspended
alpha/cvs-gcc4-profile.diff -p0
Modified: glibc-package/trunk/debian/rules
===================================================================
--- glibc-package/trunk/debian/rules 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/rules 2006-04-11 23:26:45 UTC (rev 1417)
@@ -118,7 +118,7 @@
curpass = $(filter-out %_,$(subst _,_ ,$@))
DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic
-DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
+DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales locales-all
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
# Generic kernel version check
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2006-04-11 22:59:11 UTC (rev 1416)
+++ glibc-package/trunk/debian/rules.d/build.mk 2006-04-11 23:26:45 UTC (rev 1417)
@@ -110,6 +110,9 @@
if [ $(curpass) = libc ]; then \
$(MAKE) -f debian/generate-supported.mk IN=$(DEB_SRCDIR)/localedata/SUPPORTED \
OUT=debian/tmp-$(curpass)/usr/share/i18n/SUPPORTED; \
+ $(MAKE) -C $(DEB_SRCDIR)/localedata -j $(NJOBS) \
+ objdir=$(DEB_BUILDDIR) install_root=$(CURDIR)/debian/tmp-$(curpass) \
+ install-locales; \
(cd $(DEB_SRCDIR)/manual && texi2html -split_chapter libc.texinfo); \
fi
Reply to: