r1644 - in glibc-package/branches/glibc-2.4/debian: . control.in debhelper.in
Author: barbier
Date: 2006-06-08 21:38:06 +0000 (Thu, 08 Jun 2006)
New Revision: 1644
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/debhelper.in/locales.config
Log:
Merge from trunk:
* debian/control.in/main: also make locales Conflicts: belocs-locales-bin.
* debian/debhelper.in/locales.config: some programs keep modifying
/etc/environment to store locale variables, so read /etc/environment
even when upgrading new versions. Of course, /etc/default/locale has
still a higher precedence over /etc/environment. (Closes: #363644)
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-06-08 21:17:49 UTC (rev 1643)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-06-08 21:38:06 UTC (rev 1644)
@@ -137,6 +137,7 @@
glibc (2.3.6-16) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Add arm/cvs-gcc4.1-raise.diff (fix build failure with gcc-4.1) from
upstream.
* Add ia64/cvs-gcc41-atomic_h.diff (fix build failure with gcc-4.1) from
@@ -146,6 +147,13 @@
* debian/rules.d/build.mk: use ld.so instead of libc.so to determine if the
host CPU is able to run the testsuite.
+ [ Denis Barbier ]
+ * debian/control.in/main: also make locales Conflicts: belocs-locales-bin.
+ * debian/debhelper.in/locales.config: some programs keep modifying
+ /etc/environment to store locale variables, so read /etc/environment
+ even when upgrading new versions. Of course, /etc/default/locale has
+ still a higher precedence over /etc/environment. (Closes: #363644)
+
-- Aurelien Jarno <aurel32@debian.org> Thu, 8 Jun 2006 08:03:49 +0200
glibc (2.3.6-15) unstable; urgency=low
Modified: glibc-package/branches/glibc-2.4/debian/control
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control 2006-06-08 21:17:49 UTC (rev 1643)
+++ glibc-package/branches/glibc-2.4/debian/control 2006-06-08 21:38:06 UTC (rev 1644)
@@ -6,7 +6,7 @@
mig (>= 1.3-2) [hurd-i386], hurd-dev (>= 20020608-1) [hurd-i386], gnumach-dev [hurd-i386],
kfreebsd-kernel-headers [kfreebsd-i386 kfreebsd-amd64],
gcc-4.1, binutils (>= 2.16.1cvs20051109-1),
- autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 4.1.76),
+ autoconf, sed (>= 4.0.5-4), gawk, debhelper (>= 5.0),
libc6-dev-amd64 [i386], libc6-dev-ppc64 [powerpc], libc6-dev-i386 [amd64], libc6-dev-powerpc [ppc64], libc6-dev-sparc64 [sparc], libc6-dev-s390x [s390],
quilt
Build-Depends-Indep: perl, po-debconf (>= 1.0)
@@ -29,7 +29,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config, belocs-locales-data
+Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
Modified: glibc-package/branches/glibc-2.4/debian/control.in/main
===================================================================
--- glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-08 21:17:49 UTC (rev 1643)
+++ glibc-package/branches/glibc-2.4/debian/control.in/main 2006-06-08 21:38:06 UTC (rev 1644)
@@ -29,7 +29,7 @@
Section: libs
Priority: standard
Depends: ${locale:Depends}, debconf | debconf-2.0
-Conflicts: base-config, belocs-locales-data
+Conflicts: base-config, belocs-locales-bin, belocs-locales-data
Replaces: base-config, lliurex-belocs-locales-data
Description: GNU C Library: National Language (locale) data [support]
Machine-readable data files, shared objects and programs used by the
Modified: glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config
===================================================================
--- glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config 2006-06-08 21:17:49 UTC (rev 1643)
+++ glibc-package/branches/glibc-2.4/debian/debhelper.in/locales.config 2006-06-08 21:38:06 UTC (rev 1644)
@@ -23,16 +23,8 @@
else
LG=/dev/null
fi
-DEFAULT_ENVIRONMENT=None
-EE="/etc/default/locale"
-# Prior to locales 2.3.6-5, variables were stored in /etc/environment
-if [ "$1" = "configure" ] && [ -e "/etc/environment" ] && dpkg --compare-versions "$2" lt 2.3.6-5
-then
- EE="/etc/environment"
-fi
-if [ -e "$EE" ]; then
- DEFAULT_ENVIRONMENT=$(awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}' $EE)
-fi
+DEFAULT_ENVIRONMENT=$(cat /etc/environment /etc/default/locale 2>/dev/null | awk 'BEGIN {lang="None"} /^LANG=/ {gsub("\"", ""); sub("LANG=", ""); lang=$0;} END {print lang}')
+[ -n "$DEFAULT_ENVIRONMENT" ] || DEFAULT_ENVIRONMENT=None
# Add a newline in case /etc/locale.gen has no trailing newline at EOF
SUPPORTED_LOCALES="
Reply to: