r1472 - in glibc-package/trunk/debian: . sysdeps

[Aurelien Jarno <aurel32@costa.debian.org>]

Author: aurel32
Date: 2006-05-05 03:46:25 +0000 (Fri, 05 May 2006)
New Revision: 1472

Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
  * sysdeps/depflags.pl: bumped the versioned conflicts with initrd-tools
    to 0.1.84.1, as older version use LD_ASSUME_KERNEL=2.4.  (Closes: #365647)



Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog	2006-05-04 22:53:35 UTC (rev 1471)
+++ glibc-package/trunk/debian/changelog	2006-05-05 03:46:25 UTC (rev 1472)
@@ -9,6 +9,8 @@
     Thibault.  (Closes: #349204)
   * sysdeps/i386.mk: build glibc with --with-__thread on i386.
   * debian/local/manpages: s/woody/etch/g.  (Closes: #364198)
+  * sysdeps/depflags.pl: bumped the versioned conflicts with initrd-tools 
+    to 0.1.84.1, as older version use LD_ASSUME_KERNEL=2.4.  (Closes: #365647)
 
   [ Denis Barbier ]
   * Preserve hard links when compiling the locales-all package, this reduces

Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl	2006-05-04 22:53:35 UTC (rev 1471)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl	2006-05-05 03:46:25 UTC (rev 1472)
@@ -147,11 +147,13 @@
 # Replace libc-dev (<< 2.3.5-2) for fixing #280030.
 push @{$libc_dev_c{'Replaces'}}, "${libc}-prof (<< 2.3.5-2)";
 
-# Conflict old initrd-tools (<< 0.1.79) and e2fsprogs (<< 1.35-7)
-# that cannot work with new ldd.
-push @{$libc_c{'Conflicts'}}, 'initrd-tools (<< 0.1.79)';
+# 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)';
+
 # 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';