Author: aurel32
Date: 2011-08-12 13:30:45 +0000 (Fri, 12 Aug 2011)
New Revision: 4865
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/control
glibc-package/trunk/debian/control.in/main
glibc-package/trunk/debian/debhelper.in/locales-all.dirs
glibc-package/trunk/debian/debhelper.in/locales-all.install
glibc-package/trunk/debian/debhelper.in/locales-all.postinst
glibc-package/trunk/debian/debhelper.in/locales-all.prerm
glibc-package/trunk/debian/debhelper.in/locales.postinst
glibc-package/trunk/debian/debhelper.in/locales.prerm
glibc-package/trunk/debian/rules.d/build.mk
Log:
* Provide locales in locales-all as separated files instead of adding them
to locale-archive. Closes: #537743, #636694.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2011-08-10 11:27:26 UTC (rev
4864)
+++ glibc-package/trunk/debian/changelog 2011-08-12 13:30:45 UTC (rev
4865)
@@ -1,8 +1,11 @@
eglibc (2.13-17) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Improve libc.NEWS to also include headers.
* Add debian/patches/cvs-dlopen-tls.diff to fix handling of static TLS in
dlopen'ed objects. Closes: #637239.
+ * Provide locales in locales-all as separated files instead of adding them
+ to locale-archive. Closes: #537743, #636694.
-- Aurelien Jarno <[email protected]> Tue, 09 Aug 2011 11:40:02 +0200
Modified: glibc-package/trunk/debian/control
===================================================================
--- glibc-package/trunk/debian/control 2011-08-10 11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/control 2011-08-12 13:30:45 UTC (rev 4865)
@@ -1,7 +1,7 @@
Source: eglibc
Section: libs
Priority: required
-Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, lzma,
xz-utils, file, quilt,
+Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, xz-utils,
file, quilt,
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22),
linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev
[hurd-i386], libpthread-stubs0-dev [hurd-i386],
@@ -93,7 +93,8 @@
Section: localization
Priority: extra
Multi-Arch: foreign
-Depends: ${locale:Depends}, ${misc:Depends}, lzma
+Depends: ${locale:Depends}, ${misc:Depends}
+Breaks: locales (<< 2.13-17)
Provides: locales
Description: Embedded GNU C Library: Precompiled locale data
This package contains the precompiled locale data for all supported locales.
Modified: glibc-package/trunk/debian/control.in/main
===================================================================
--- glibc-package/trunk/debian/control.in/main 2011-08-10 11:27:26 UTC (rev
4864)
+++ glibc-package/trunk/debian/control.in/main 2011-08-12 13:30:45 UTC (rev
4865)
@@ -1,7 +1,7 @@
Source: eglibc
Section: libs
Priority: required
-Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, lzma,
xz-utils, file, quilt,
+Build-Depends: gettext, make (>= 3.80), dpkg-dev (>= 1.16.0), bzip2, xz-utils,
file, quilt,
autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 7.4.3), tar (>= 1.22),
linux-libc-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], gnumach-dev
[hurd-i386], libpthread-stubs0-dev [hurd-i386],
@@ -93,7 +93,8 @@
Section: localization
Priority: extra
Multi-Arch: foreign
-Depends: ${locale:Depends}, ${misc:Depends}, lzma
+Depends: ${locale:Depends}, ${misc:Depends}
+Breaks: locales (<< 2.13-17)
Provides: locales
Description: Embedded GNU C Library: Precompiled locale data
This package contains the precompiled locale data for all supported locales.
Modified: glibc-package/trunk/debian/debhelper.in/locales-all.dirs
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.dirs 2011-08-10
11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.dirs 2011-08-12
13:30:45 UTC (rev 4865)
@@ -1 +1 @@
-usr/lib/locales-all
+usr/lib/locale
Modified: glibc-package/trunk/debian/debhelper.in/locales-all.install
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.install 2011-08-10
11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.install 2011-08-12
13:30:45 UTC (rev 4865)
@@ -1 +1 @@
-BUILD-TREE/locales-all/supported.tar.lzma usr/lib/locales-all
+BUILD-TREE/locales-all/usr/lib/locale/* /usr/lib/locale
Modified: glibc-package/trunk/debian/debhelper.in/locales-all.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.postinst
2011-08-10 11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.postinst
2011-08-12 13:30:45 UTC (rev 4865)
@@ -3,14 +3,9 @@
export LC_ALL=C
if [ "$1" = "configure" ]; then
- [ -d /usr/lib/locale ] || mkdir /usr/lib/locale
- # Remove existing locales, otherwise localedef does not
- # overwrite them and exits with a non-null value
+ # Remove existing locale-archive, otherwise they are prefered
+ # to the ones in this package
rm -f /usr/lib/locale/locale-archive 2>/dev/null || true
- tmpdir=$(mktemp -d -t locales.XXXXXXXXXX)
- trap 'rm -rf "$tmpdir" > /dev/null 2>&1' exit
- tar --use-compress-program /usr/bin/lzma -xf
/usr/lib/locales-all/supported.tar.lzma -C "$tmpdir"
- localedef --quiet --add-to-archive "$tmpdir"/*
fi
#DEBHELPER#
Modified: glibc-package/trunk/debian/debhelper.in/locales-all.prerm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales-all.prerm 2011-08-10
11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/debhelper.in/locales-all.prerm 2011-08-12
13:30:45 UTC (rev 4865)
@@ -7,10 +7,6 @@
if [ -x /usr/sbin/locale-gen ] ; then
# If yes, generate locales selected in the debconf question
locale-gen
- else
- # If not, clean the locales
- rm -f /usr/lib/locale/locale-archive
- rmdir --ignore-fail-on-non-empty /usr/lib/locale
fi
;;
*)
Modified: glibc-package/trunk/debian/debhelper.in/locales.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.postinst 2011-08-10
11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/debhelper.in/locales.postinst 2011-08-12
13:30:45 UTC (rev 4865)
@@ -58,7 +58,7 @@
fi
# Update requested locales if locales-all is not installed
- if [ -f /usr/lib/locales-all/supported.tar.lzma ] ; then
+ if dpkg-query -S locales-all >/dev/null 2>&1 ; then
echo "locales-all installed, skipping locales generation"
else
locale-gen
Modified: glibc-package/trunk/debian/debhelper.in/locales.prerm
===================================================================
--- glibc-package/trunk/debian/debhelper.in/locales.prerm 2011-08-10
11:27:26 UTC (rev 4864)
+++ glibc-package/trunk/debian/debhelper.in/locales.prerm 2011-08-12
13:30:45 UTC (rev 4865)
@@ -3,6 +3,8 @@
case "$1" in
remove|purge)
+ # This test should be kept only for compatibility with old
+ # locales-all packages, new ones don't use locale-archive.
if ! [ -f /usr/lib/locales-all/supported.tar.lzma ] ; then
# If locales-all is not installed, clean the locales
rm -f /usr/lib/locale/locale-archive
Modified: glibc-package/trunk/debian/rules.d/build.mk
===================================================================
--- glibc-package/trunk/debian/rules.d/build.mk 2011-08-10 11:27:26 UTC (rev
4864)
+++ glibc-package/trunk/debian/rules.d/build.mk 2011-08-12 13:30:45 UTC (rev
4865)
@@ -92,7 +92,6 @@
$(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) \
objdir=$(DEB_BUILDDIR)
install_root=$(CURDIR)/build-tree/locales-all \
localedata/install-locales; \
- tar --use-compress-program /usr/bin/lzma --owner root --group root
-cf $(CURDIR)/build-tree/locales-all/supported.tar.lzma -C
$(CURDIR)/build-tree/locales-all/usr/lib/locale .; \
fi
touch $@
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
