r2200 - in glibc-package/trunk/debian: . sysdeps
Author: schizo
Date: 2007-05-08 19:22:17 +0000 (Tue, 08 May 2007)
New Revision: 2200
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
* debian/sysdeps/depflags.pl: Clean out relationships for packages
that do not exist in sarge or later.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2007-05-07 12:41:07 UTC (rev 2199)
+++ glibc-package/trunk/debian/changelog 2007-05-08 19:22:17 UTC (rev 2200)
@@ -1,10 +1,15 @@
glibc (2.5-8) UNRELEASED; urgency=low
- * debian/sysdeps/depflags.pl: Add a conflicts on binutils
+ [ Aurelien Jarno ]
+ * debian/sysdeps/depflags.pl: Add a conflicts on binutils
(<< 2.17cvs20070426-1) for libc-dev. Closes: #422625.
- -- Aurelien Jarno <aurel32@debian.org> Mon, 07 May 2007 14:39:15 +0200
+ [ Clint Adams ]
+ * debian/sysdeps/depflags.pl: Clean out relationships for packages
+ that do not exist in sarge or later.
+ -- Clint Adams <schizo@debian.org> Tue, 08 May 2007 15:12:20 -0400
+
glibc (2.5-7) unstable; urgency=low
* debian/sysdeps/i386.mk: switch from --includir= to amd64_includedir.
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2007-05-07 12:41:07 UTC (rev 2199)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2007-05-08 19:22:17 UTC (rev 2200)
@@ -49,9 +49,6 @@
# nss-db is now seperate
push @{$libc_c{'Recommends'}}, 'libnss-db';
-# Old strace doesn't work with current libc6
-push @{$libc_c{'Conflicts'}}, 'strace (<< 4.0-0)';
-
# 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)';
@@ -64,96 +61,6 @@
push @{$libc_dev_c{'Conflicts'}}, 'gcc-2.95 (<< 1:2.95.3-8)';
}
-# The db2 changes left libnss-db broken, except for the newer version
-# which uses db3
-push @{$libc_c{'Conflicts'}}, 'libnss-db (<= 2.2-6.1.1)';
-
-# From now on we provide our own ldconfig and ldd, so we don't need ldso
-push @{$libc_dev_c{'Replaces'}}, 'ldso (<= 1.9.11-9)';
-push @{$libc_c{'Replaces'}}, 'ldso (<= 1.9.11-9)';
-
-# Some old packages from glibc that don't get built, but need to be handled
-push @{$libc_c{'Replaces'}}, ('timezone', 'timezones', 'gconv-modules',
- 'libtricks');
-push @{$libc_c{'Conflicts'}}, ('timezone', 'timezones', 'gconv-modules',
- 'libtricks', "${libc}-doc");
-
-# conflicts from libc5 days
-if ($DEB_HOST_GNU_TYPE =~ m/^(i486|m68k)-linux-gnu$/) {
- push @{$libc_c{'Conflicts'}}, ('libc5 (<< 5.4.33-7)', 'libpthread0 (<< 0.7-10)');
-} elsif ($DEB_HOST_GNU_TYPE eq 'sparc-linux-gnu') {
- push @{$libc_c{'Conflicts'}}, ('libc5 (<< 5.3.12-2)', 'libpthread0 (<< 0.7-10)');
-}
-if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i486|m68k|sparc)-linux-gnu$/) {
- push @{$libc_dev_c{'Conflicts'}}, ('libpthread0-dev', 'libdl1-dev',
- 'libdb1-dev', 'libgdbm1-dev');
- # Add this here too, old package
- push @{$libc_c{'Conflicts'}}, ("${libc}-bin", 'libwcsmbs');
- push @{$libc_c{'Replaces'}}, "${libc}-bin";
-}
-
-# Old, Pre glibc 2.1
-if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i486|m68k|sparc|powerpc|arm)-linux-gnu$/) {
- push @{$libc_dev_c{'Conflicts'}}, ("${libc}-dev (<< 2.0.110-1)",
- 'locales (<< 2.1.3-5)');
-}
-
-# XXX: Not sure why this conflict is here, maybe broken c++?
-if ($DEB_HOST_GNU_TYPE =~ m/^(i486|m68k|alpha)-linux-gnu$/) {
- push @{$libc_c{'Conflicts'}}, ('apt (<< 0.3.0)', 'libglib1.2 (<< 1.2.1-2)');
-}
-
-# Some old c++ libs
-if ($DEB_HOST_GNU_TYPE =~ m/^(alpha|i486)-linux-gnu$/) {
- push @{$libc_dev_c{'Conflicts'}}, 'libstdc++2.9-dev';
-} elsif ($DEB_HOST_GNU_TYPE eq "powerpc-linux-gnu") {
- push @{$libc_dev_c{'Conflicts'}}, ('libstdc++2.9 (<< 2.91.58-2.1)',
- 'libstdc++2.8 (<< 2.90.29-1)');
-} elsif ($DEB_HOST_GNU_TYPE eq "m68k-linux-gnu") {
- push @{$libc_dev_c{'Conflicts'}}, 'libstdc++2.9-dev';
-}
-
-# XXX: What is this!?
-if ($DEB_HOST_GNU_TYPE eq "alpha-linux-gnu") {
- push @{$libc_dev_c{'Conflicts'}}, ('libncurses4-dev (<< 4.2-3.1)',
- 'libreadlineg2-dev (<< 2.1-13.1)');
-}
-
-# Conflict/Replace netkit-rpc, and its manpages
-push @{$libc_c{'Conflicts'}}, 'netkit-rpc';
-push @{$libc_c{'Replaces'}}, 'netkit-rpc';
-push @{$libc_dev_c{'Conflicts'}}, 'netkit-rpc';
-push @{$libc_dev_c{'Replaces'}}, 'netkit-rpc';
-push @{$libc_c{'Replaces'}}, 'netbase (<< 4.0)';
-push @{$libc_dev_c{'Replaces'}}, 'netbase (<< 4.0)';
-
-# Conflict old wine - didn't like NPTL
-push @{$libc_c{'Conflicts'}}, 'wine (<< 0.0.20031118-1)';
-
-# Conflict some packages because of bad errno handling
-push @{$libc_c{'Conflicts'}}, 'cyrus-imapd (<< 1.5.19-15)';
-
-# Conflict old gcc because they have /usr/hppa64-linux/include symlink
-# (Bug#239020)
-if ($DEB_HOST_GNU_TYPE eq "hppa-linux-gnu") {
- push @{$libc_dev_c{'Conflicts'}}, ('gcc-3.3-hppa64 (<= 1:3.3.3-6)',
- 'gcc-3.4-hppa64 (<= 3.4-0pre4)');
-}
-
-# Replace kerberos4kth-dev (<< 1.2.2-10) for fixing #234347.
-push @{$libc_dev_c{'Replaces'}}, 'kerberos4kth-dev (<< 1.2.2-10)';
-
-# Replace libc-dev (<< 2.3.2.ds1-14) for fixing #239170.
-# Replace libc-dev (<< 2.3.5-2) for fixing #280030.
-push @{$libc_dev_c{'Replaces'}}, "${libc}-prof (<< 2.3.5-2)";
-
-# Conflict e2fsprogs (<< 1.35-7) that cannot work with new ldd.
-push @{$libc_c{'Conflicts'}}, 'e2fsprogs (<< 1.35-7)';
-
-# Conflict old initrd-tools (<< 0.1.84.1) that cannot work with
-# new libc.
-push @{$libc_c{'Conflicts'}}, 'initrd-tools (<< 0.1.84.1)';
-
## Conflict versions of binutils version that does not support DT_GNU_HASH
push @{$libc_dev_c{'Conflicts'}}, 'binutils (<< 2.17cvs20070426-1)';
Reply to: