r1020 - in glibc-package/trunk/debian: . sysdeps
Author: gotom
Date: 2005-08-25 00:24:44 +0000 (Thu, 25 Aug 2005)
New Revision: 1020
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/sysdeps/depflags.pl
Log:
Changed e2fsprogs conflicts from 1.37-2sarge1 to 1.35-7.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2005-08-24 08:55:21 UTC (rev 1019)
+++ glibc-package/trunk/debian/changelog 2005-08-25 00:24:44 UTC (rev 1020)
@@ -31,7 +31,7 @@
* debian/sysdeps/linux.mk: Check SETNJOBS environment variable to specify
the number of parallel make by users.
- * debian/sysdeps/depflags.pl: Add Conflicts: e2fsprogs (<= 1.37-2sarge1)
+ * debian/sysdeps/depflags.pl: Add Conflicts: e2fsprogs (<< 1.35-7)
because new ldd cannot work with old e2fsprogs. (Closes: #324550)
* Michael Banck <mbanck@debian.org>:
Modified: glibc-package/trunk/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/trunk/debian/sysdeps/depflags.pl 2005-08-24 08:55:21 UTC (rev 1019)
+++ glibc-package/trunk/debian/sysdeps/depflags.pl 2005-08-25 00:24:44 UTC (rev 1020)
@@ -140,10 +140,10 @@
# 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.37-2sarge1)
+# 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)';
-push @{$libc_c{'Conflicts'}}, 'e2fsprogs (<= 1.37-2sarge1)';
+push @{$libc_c{'Conflicts'}}, 'e2fsprogs (<< 1.35-7)';
# Make sure we only have one version of libc-dev installed
push @{$libc_dev_c{'Provides'}}, 'libc-dev';
Reply to: