r3769 - in glibc-package/branches/eglibc-2.10/debian: . control.in debhelper.in patches/any rules.d sysdeps
Author: aurel32
Date: 2009-08-18 19:21:15 +0000 (Tue, 18 Aug 2009)
New Revision: 3769
Removed:
glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.mk
glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.pl
Modified:
glibc-package/branches/eglibc-2.10/debian/changelog
glibc-package/branches/eglibc-2.10/debian/control
glibc-package/branches/eglibc-2.10/debian/control.in/libc
glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst
glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff
glibc-package/branches/eglibc-2.10/debian/rules
glibc-package/branches/eglibc-2.10/debian/rules.d/control.mk
Log:
Sync from trunk, revisions 3722-3747
Modified: glibc-package/branches/eglibc-2.10/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/changelog 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-08-18 19:21:15 UTC (rev 3769)
@@ -124,10 +124,21 @@
eglibc (2.9-24) UNRELEASED; urgency=low
+ [ Aurelien Jarno ]
* Remove any/cvs-pthread_mutex_lock.diff following upstream decision.
+ * Replace debian/sysdeps/depflags.{mk,pl} by entries in debian/control
+ using the "new" dpkg-dev features. Clean-out some very old entries.
+ * Recommends libc6-i686 on amd64 and libc0.1-i686 on kfreebsd-amd64
+ (Closes: bug#455603).
+ * Don't access dpkg files directly in libc6.preinst.
+ * patches/any/local-ld-multiarch.diff: convert i586 and i686 into i486
+ (Closes: bug#540646).
- -- Aurelien Jarno <aurel32@debian.org> Thu, 30 Jul 2009 22:59:32 +0200
+ [ Petr Salinger ]
+ * kfreebsd/local-sysdeps.diff: update to revision 2696 (from glibc-bsd).
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 09 Aug 2009 21:12:43 +0200
+
eglibc (2.9-23) unstable; urgency=low
* debhelper.in/libc.postinst, sysdeps/depflags.pl: remove upgrade code
Modified: glibc-package/branches/eglibc-2.10/debian/control
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/control 2009-08-18 19:21:15 UTC (rev 3769)
@@ -79,8 +79,12 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -90,8 +94,11 @@
Architecture: amd64 arm armeb armel i386 m32r m68k mips mipsel powerpc ppc64 sparc s390 hppa sh3 sh4 sh3eb sh4eb
Section: libdevel
Priority: optional
-Depends: libc6 (= ${binary:Version})
+Depends: libc6 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -147,8 +154,12 @@
Architecture: alpha ia64
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -158,8 +169,11 @@
Architecture: alpha ia64
Section: libdevel
Priority: optional
-Depends: libc6.1 (= ${binary:Version})
+Depends: libc6.1 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -215,8 +229,12 @@
Architecture: hurd-i386
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -226,8 +244,11 @@
Architecture: hurd-i386
Section: libdevel
Priority: optional
-Depends: libc0.3 (= ${binary:Version})
+Depends: libc0.3 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
@@ -283,8 +304,12 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -294,8 +319,11 @@
Architecture: kfreebsd-i386 kfreebsd-amd64
Section: libdevel
Priority: optional
-Depends: libc0.1 (= ${binary:Version})
+Depends: libc0.1 (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/branches/eglibc-2.10/debian/control.in/libc
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/control.in/libc 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/control.in/libc 2009-08-18 19:21:15 UTC (rev 3769)
@@ -2,8 +2,12 @@
Architecture: @archs@
Section: libs
Priority: required
+Depends: hurd (>= 20070606-1+SVN) [hurd-i386], libgcc1 [!hppa !m68k], libgcc2 [m68k], libgcc4 [hppa]
+Recommends: libc6-i686 [amd64], libc0.1-i686 [kfreebsd-amd64]
+Suggests: glibc-doc, debconf | debconf-2.0, locales [!hurd-i386]
Provides: ${locale-compat:Depends}
-Suggests: debconf | debconf-2.0
+Conflicts: tzdata-etch, tzdata (<< 2007k-1)
+Breaks: nscd (<< 2.9)
Description: GNU C Library: Shared libraries
Contains the standard libraries that are used by nearly all programs on
the system. This package includes shared versions of the standard C library
@@ -13,8 +17,11 @@
Architecture: @archs@
Section: libdevel
Priority: optional
-Depends: @libc@ (= ${binary:Version})
+Depends: @libc@ (= ${binary:Version}), linux-libc-dev [linux-any], kfreebsd-kernel-headers (>= 0.11) [kfreebsd-any], gnumach-dev [hurd-i386], hurd-dev (>= 20080607-3) [hurd-i386], libpthread-stubs0-dev [hurd-i386]
Recommends: gcc | c-compiler
+Suggests: glibc-doc, manpages-dev
+Provides: libc-dev, libc6-dev [alpha ia64 hurd-i386 kfreebsd-i386 kfreebsd-amd64]
+Conflicts: binutils (<< 2.17cvs20070426-1)
Description: GNU C Library: Development Libraries and Header Files
Contains the symlinks, headers, and object files needed to compile
and link programs which use the standard C library.
Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc.preinst 2009-08-18 19:21:15 UTC (rev 3769)
@@ -6,19 +6,21 @@
preversion=$2
rm_conffile() {
- CONFFILE="$1"
+ local PKGNAME="$1"
+ local CONFFILE="$2"
- if [ -e "$CONFFILE" ]; then
- md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
- old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`"
- if [ "$md5sum" != "$old_md5sum" ]; then
- echo "Obsolete conffile $CONFFILE has been modified by you."
- echo "Saving as $CONFFILE.dpkg-bak ..."
- mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
- else
- echo "Removing obsolete conffile $CONFFILE ..."
- rm -f "$CONFFILE"
- fi
+ [ -e "$CONFFILE" ] || return 0
+
+ local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
+ local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
+ sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
+ if [ "$md5sum" != "$old_md5sum" ]; then
+ echo "Obsolete conffile $CONFFILE has been modified by you."
+ echo "Saving as $CONFFILE.dpkg-bak ..."
+ mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
+ else
+ echo "Removing obsolete conffile $CONFFILE ..."
+ rm -f "$CONFFILE"
fi
}
@@ -49,7 +51,7 @@
then
# Remove old /etc/init.d/glibc.sh init script
if dpkg --compare-versions "$preversion" le "2.9-22"; then
- rm_conffile "/etc/init.d/glibc.sh"
+ rm_conffile LIBC "/etc/init.d/glibc.sh"
update-rc.d glibc.sh remove >/dev/null
fi
Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-ld-multiarch.diff 2009-08-18 19:21:15 UTC (rev 3769)
@@ -1,3 +1,7 @@
+2009-08-09 Aurelien Jarno <aurelien@aurel32.net>
+
+ * Makeconfig: convert i586 and i686 into i486.
+
2005-01-20 Tollef Fog Heen <tfheen@debian.org>
* Makeconfig: add multiarch support
@@ -2,15 +6,13 @@
----
- Makeconfig | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
--- a/Makeconfig
+++ b/Makeconfig
-@@ -191,6 +191,11 @@
+@@ -191,6 +191,13 @@
endif
inst_libdir = $(install_root)$(libdir)
-+# Extra places to look for libraries
++# Multiarch places to look for libraries
+ifndef extra_libdir
-+extra_libdir = /lib/$(config-machine)-$(config-os):$(exec_prefix)/lib/$(config-machine)-$(config-os)
++multiarch-machine = $(subst i586,i486,$(config-machine))
++multiarch-machine = $(subst i686,i486,$(multiarch-machine))
++extra_libdir = /lib/$(multiarch-machine)-$(config-os):$(exec_prefix)/lib/$(multiarch-machine)-$(config-os)
+endif
@@ -20,7 +22,7 @@
# Where to install the shared library and dynamic linker.
ifndef slibdir
slibdir = $(exec_prefix)/lib
-@@ -501,6 +506,10 @@
+@@ -501,6 +508,10 @@
default-rpath = $(libdir)
endif
Modified: glibc-package/branches/eglibc-2.10/debian/rules
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/rules 2009-08-18 19:21:15 UTC (rev 3769)
@@ -142,8 +142,6 @@
-include debian/sysdeps/$(DEB_HOST_ARCH_OS).mk
-include debian/sysdeps/$(DEB_HOST_ARCH).mk
-include debian/sysdeps/depflags.mk
-
# Don't run dh_strip on this package
NOSTRIP_$(libc)-dbg = 1
Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/control.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/rules.d/control.mk 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/rules.d/control.mk 2009-08-18 19:21:15 UTC (rev 3769)
@@ -15,7 +15,7 @@
debian/control: $(stamp)control
$(stamp)control: debian/control.in/main $(control_deps) \
- debian/rules.d/control.mk # debian/sysdeps/depflags.pl
+ debian/rules.d/control.mk
# Check that all files end with a new line
set -e ; for i in debian/control.in/* ; do \
Deleted: glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.mk
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.mk 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.mk 2009-08-18 19:21:15 UTC (rev 3769)
@@ -1,25 +0,0 @@
-depflags = libc=$(libc) glibc=glibc \
- DEB_HOST_ARCH_OS=$(DEB_HOST_ARCH_OS) \
- DEB_HOST_ARCH=$(DEB_HOST_ARCH) \
- perl debian/sysdeps/depflags.pl
-
-libc_control_flags = $(shell $(depflags) libc)
-libc_dev_control_flags = $(shell $(depflags) libc_dev)
-
-# If there's a -DDepends for libc-dev, add this to it. If there isn't
-# then the control file's depends line (which contains this) will be used.
-# This is gross and another reason why depflags.pl must die.
-libc_dev_dep = $(libc) (= $(DEB_VERSION)),
-libc_dev_control_flags := $(subst Depends=",Depends="$(libc_dev_dep) ,$(libc_dev_control_flags))
-
-$(libc)_control_flags = $(libc_control_flags)
-$(libc)-dev_control_flags = $(libc_dev_control_flags)
-
-test_depflags:
- @echo
- @echo "$(libc):"
- @echo ' $(libc_control_flags)'
- @echo
- @echo "$(libc)-dev:"
- @echo ' $(libc_dev_control_flags)'
- @echo
Deleted: glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.pl 2009-08-17 20:38:09 UTC (rev 3768)
+++ glibc-package/branches/eglibc-2.10/debian/sysdeps/depflags.pl 2009-08-18 19:21:15 UTC (rev 3769)
@@ -1,85 +0,0 @@
-#!/usr/bin/perl
-
-# These get export by debian/sysdeps/depflags.mk
-$DEB_HOST_ARCH_OS = $ENV{'DEB_HOST_ARCH_OS'};
-$DEB_HOST_ARCH = $ENV{'DEB_HOST_ARCH'};
-$libc = $ENV{'libc'};
-$glibc = $ENV{'glibc'};
-@deptypes = ('Depends', 'Replaces', 'Conflicts', 'Provides',
- 'Suggests');
-
-# Let's make sure we are sane
-if (!defined($DEB_HOST_ARCH_OS) or !defined($DEB_HOST_ARCH) or
- !defined($libc) or !defined($glibc)) {
- die "Could not get all parameters";
-}
-
-@ARGV == 1 or die "Usage: depflags <type>";
-$type = $ARGV[0];
-
-# OS specific stuff
-if ($DEB_HOST_ARCH_OS eq "hurd") {
- push @{$libc_dev_c{'Depends'}}, ('gnumach-dev', 'hurd-dev (>= 20080607-3)', 'libpthread-stubs0-dev');
- push @{$libc_dev_c{'Replaces'}}, 'glibc2-dev';
- push @{$libc_dev_c{'Conflicts'}}, 'glibc2-dev';
- push @{$libc_c{'Replaces'}}, 'glibc2';
- push @{$libc_c{'Conflicts'}}, 'glibc2';
- push @{$libc_c{'Depends'}}, 'hurd (>= 20070606-1+SVN)';
-}
-if ($DEB_HOST_ARCH_OS eq "linux") {
- push @{$libc_c{'Suggests'}}, 'locales';
- push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
- push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev';
-}
-if ($DEB_HOST_ARCH_OS eq "kfreebsd") {
- push @{$libc_c{'Suggests'}}, 'locales';
- push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
- push @{$libc_dev_c{'Replaces'}}, 'kfreebsd-kernel-headers (<< 0.11)';
- push @{$libc_dev_c{'Depends'}}, 'kfreebsd-kernel-headers (>= 0.11)';
-}
-
-# ${glibc}-doc is suggested by $libc_c and $libc_dev_c.
-push @{$libc_c{'Suggests'}}, "${glibc}-doc";
-push @{$libc_dev_c{'Suggests'}}, "${glibc}-doc";
-push @{$libc_dev_c{'Suggests'}}, "manpages-dev";
-
-# nss-db is now seperate
-push @{$libc_c{'Recommends'}}, 'libnss-db';
-
-## Conflict versions of binutils version that does not support DT_GNU_HASH
-push @{$libc_dev_c{'Conflicts'}}, 'binutils (<< 2.17cvs20070426-1)';
-
-# Make sure we only have one version of libc-dev installed
-push @{$libc_dev_c{'Provides'}}, 'libc-dev';
-push @{$libc_dev_c{'Conflicts'}}, 'libc-dev';
-if ($libc ne "libc6") {
- push @{$libc_dev_c{'Provides'}}, 'libc6-dev';
-}
-
-# Conflict with older versions of tzdata that need tzconfig.
-push @{$libc_c{'Conflicts'}}, 'tzdata (<< 2007k-1), tzdata-etch';
-
-# Conflict with older versions of nscd
-push @{$libc_c{'Conflicts'}}, 'nscd (<< 2.9)';
-
-# Depends on libgcc1/libgcc2/libgcc4
-if ($DEB_HOST_ARCH =~ m/^hppa$/) {
- push @{$libc_c{'Depends'}}, 'libgcc4';
-} elsif ($DEB_HOST_ARCH =~ m/^m68k$/) {
- push @{$libc_c{'Depends'}}, 'libgcc2';
-} else {
- push @{$libc_c{'Depends'}}, 'libgcc1';
-}
-
-if ($type eq "libc") {
- %pkg = %libc_c;
-} elsif ($type eq "libc_dev") {
- %pkg = %libc_dev_c;
-} else {
- die "Unknown package $type";
-}
-
-foreach $dep (@deptypes) {
- next if not defined($pkg{$dep});
- print "-D${dep}=\"" . join(', ', @{$pkg{$dep}}) . "\" ";
-}
Reply to: