r3665 - in glibc-package/trunk/debian: . debhelper.in sysdeps
Author: aurel32
Date: 2009-07-26 15:14:00 +0000 (Sun, 26 Jul 2009)
New Revision: 3665
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/debhelper.in/libc.postinst
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
* debhelper.in/libc.postinst, sysdeps/depflags.pl: remove upgrade code
for pre-etch installations.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2009-07-26 09:57:47 UTC (rev 3664)
+++ glibc-package/trunk/debian/changelog 2009-07-26 15:14:00 UTC (rev 3665)
@@ -1,3 +1,10 @@
+eglibc (2.9-23) UNRELEASED; urgency=low
+
+ * debhelper.in/libc.postinst, sysdeps/depflags.pl: remove upgrade code
+ for pre-etch installations.
+
+ -- Aurelien Jarno <aurel32@debian.org> Sun, 26 Jul 2009 17:13:32 +0200
+
eglibc (2.9-22) unstable; urgency=low
* kfreebsd/local-sysdeps.diff: update to revision 2670 (from glibc-bsd).
Modified: glibc-package/trunk/debian/debhelper.in/libc.postinst
===================================================================
--- glibc-package/trunk/debian/debhelper.in/libc.postinst 2009-07-26 09:57:47 UTC (rev 3664)
+++ glibc-package/trunk/debian/debhelper.in/libc.postinst 2009-07-26 15:14:00 UTC (rev 3665)
@@ -265,37 +265,6 @@
fi
fi
-if [ "`uname -s`" = Linux ]; then
-#
-# Upgrade init if possible. There was a bug in all versions
-# up to and including 2.75-4, which didn't affect i386 but
-# did affect most other architectures.
-#
-sysvinitver="`dpkg -s sysvinit 2>/dev/null | grep ^Version: | sed -e 's/^Version: *//'`"
-case "`uname -m`" in
- i?86)
- badsysvinitver="2.[0-6]*|2.7[0-3]*"
- ;;
- *)
- badsysvinitver="2.[0-6]*|2.7[0-4]*|2.75-*"
- ;;
-esac
-# Black magic. If we are in a chroot, then /proc/1/exe will not resolve to
-# a file (will return EPERM). This keeps us from breaking things in
-# debootstrap, and the like.
-case "$sysvinitver" in
- $badsysvinitver)
- ;;
- *)
- if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then
- # the devicenumber/inode pair of / is the same as that of /sbin/init's
- # root, so we're *not* in a chroot
- (init u ; sleep 1)
- fi
- ;;
-esac
-fi
-
#DEBHELPER#
exit 0
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2009-07-26 09:57:47 UTC (rev 3664)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2009-07-26 15:14:00 UTC (rev 3665)
@@ -29,13 +29,10 @@
if ($DEB_HOST_ARCH_OS eq "linux") {
push @{$libc_c{'Suggests'}}, 'locales';
push @{$libc_dev_c{'Recommends'}}, 'c-compiler';
- push @{$libc_dev_c{'Replaces'}}, ('man-db (<= 2.3.10-41)', 'gettext (<= 0.10.26-1)',
- 'ppp (<= 2.2.0f-24)', 'libgdbmg1-dev (<= 1.7.3-24)');
push @{$libc_dev_c{'Depends'}}, 'linux-libc-dev';
}
if ($DEB_HOST_ARCH_OS eq "kfreebsd") {
push @{$libc_c{'Suggests'}}, 'locales';
- push @{$libc_c{'Replaces'}}, 'libc0.1-dev (<< 2.3.2.ds1-14)';
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)';
@@ -49,19 +46,6 @@
# nss-db is now seperate
push @{$libc_c{'Recommends'}}, 'libnss-db';
-# 2.1.94 required a patch, applied in gcc -15, so c++ compiles will work again
-push @{$libc_dev_c{'Conflicts'}}, 'libstdc++2.10-dev (<< 1:2.95.2-15)';
-
-# 2.2.2+CVS requires a newer gcc. For non-i386, we just worry about the
-# weak-sym patch, since on i386 we need an even newer one because of the
-# pic-kludge that breaks libc_nonshared.a inclusion.
-if ($DEB_HOST_ARCH =~ m/^i386$/) {
- push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-9)';
- push @{$libc_c{'Suggests'}}, 'libc6-i686';
-} else {
- push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-8)';
-}
-
## Conflict versions of binutils version that does not support DT_GNU_HASH
push @{$libc_dev_c{'Conflicts'}}, 'binutils (<< 2.17cvs20070426-1)';
@@ -72,9 +56,6 @@
push @{$libc_dev_c{'Provides'}}, 'libc6-dev';
}
-# Conflict with broken libterm-readline-gnu-perl to avoid #326856.
-push @{$libc_c{'Conflicts'}}, 'libterm-readline-gnu-perl (<< 1.15-2)';
-
# Conflict with older versions of tzdata that need tzconfig.
push @{$libc_c{'Conflicts'}}, 'tzdata (<< 2007k-1), tzdata-etch';
Reply to: