r1466 - in glibc-package/branches/glibc-2.4/debian: . control.in debhelper.in patches patches/localedata rules.d
Author: barbier
Date: 2006-05-04 20:52:54 +0000 (Thu, 04 May 2006)
New Revision: 1466
Added:
glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-all.dirs
glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-all.install
glibc-package/branches/glibc-2.4/debian/patches/localedata/local-all-no-archive.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/control
glibc-package/branches/glibc-2.4/debian/control.in/main
glibc-package/branches/glibc-2.4/debian/patches/series
glibc-package/branches/glibc-2.4/debian/rules
glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
Log:
Port r1417 and r1443 from trunk to add a locales-all package
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-04-27 15:54:59 UTC (rev 1465)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-04 20:52:54 UTC (rev 1466)
@@ -33,6 +33,12 @@
The whole glibc-2.4/manual directory is removed from glibc-2.4.tar.bz2.
- debian/control: Drop Build-Depends: texinfo, texi2html.
- debian/control: Drop references to the antique libc-doc package.
+ * Ship a new locales-all package with all supported locales precompiled.
+ Let locales-all Provides: locales instead of a virtual generated-locales
+ package. This is requested by Jeroen van Wolffelaar to allow this new
+ package enter unstable. Packages which Build-Depends on locales are
+ likely to FTBFS if locales-all is installed, this dependency will be
+ fixed in a later release. (Closes: #308020)
[ Michael Banck ]
* debian/sysdeps/hurd.mk: Only use libidn for add-ons.
Modified: glibc-package/branches/glibc-2.4/debian/control
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control 2006-04-27 15:54:59 UTC (rev 1465)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-05-04 20:52:54 UTC (rev 1466)
@@ -60,6 +60,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: 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/branches/glibc-2.4/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-04-27 15:54:59 UTC (rev 1465)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-05-04 20:52:54 UTC (rev 1466)
@@ -60,6 +60,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: 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
Copied: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-all.dirs (from rev 1417, glibc-package/trunk/debian/debhelper.in/locales-all.dirs)
Copied: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales-all.install (from rev 1417, glibc-package/trunk/debian/debhelper.in/locales-all.install)
Copied: glibc-package/branches/glibc-2.4/debian/patches/localedata/local-all-no-archive.diff (from rev 1417, glibc-package/trunk/debian/patches/localedata/local-all-no-archive.diff)
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-04-27 15:54:59 UTC (rev 1465)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-04 20:52:54 UTC (rev 1466)
@@ -98,6 +98,7 @@
localedata/fix-unknown-symbols.diff
localedata/first_weekday.diff -p0
localedata/sort-UTF8-first.diff -p0
+localedata/local-all-no-archive.diff
#hppa/cvs-pie-relocs.diff -p1
#hurd-i386/cvs-getresuid-dyslexia.diff -p0
#hppa/cvs-no-ldbl-128.diff -p1
Modified: glibc-package/branches/glibc-2.4/debian/rules
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules 2006-04-27 15:54:59 UTC (rev 1465)
+++ glibc-package/branches/glibc-2.4/debian/rules 2006-05-04 20:52:54 UTC (rev 1466)
@@ -117,7 +117,7 @@
# Which build pass are we on?
curpass = $(filter-out %_,$(subst _,_ ,$@))
-DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin
+DEB_ARCH_REGULAR_PACKAGES = $(libc) $(libc)-dev $(libc)-dbg $(libc)-prof $(libc)-pic libc-bin libc-dev-bin locales-all
DEB_INDEP_REGULAR_PACKAGES = glibc-doc locales
DEB_UDEB_PACKAGES = $(libc)-udeb libnss-dns-udeb libnss-files-udeb
Modified: glibc-package/branches/glibc-2.4/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-04-27 15:54:59 UTC (rev 1465)
+++ glibc-package/branches/glibc-2.4/debian/rules.d/build.mk 2006-05-04 20:52:54 UTC (rev 1466)
@@ -104,6 +104,10 @@
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
# Remove ld.so from optimized libraries
Reply to: