r915 - in glibc-package/branches/glibc-2.3.4/debian: . sysdeps
Author: gotom
Date: 2005-06-01 15:14:30 +0000 (Wed, 01 Jun 2005)
New Revision: 915
Modified:
glibc-package/branches/glibc-2.3.4/debian/changelog
glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl
Log:
* Add conflicts to old initrd-tools for avoiding new glibc 2.3.4/5 ldd
blocks to generate initrd images. Suggested by Goswin von Brederlow
<brederlo@informatik.uni-tuebingen.de>.
- debian/sysdeps/depflags.pl: Add conflicts initrd-tools (<< 0.1.79).
Modified: glibc-package/branches/glibc-2.3.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/changelog 2005-05-27 15:26:09 UTC (rev 914)
+++ glibc-package/branches/glibc-2.3.4/debian/changelog 2005-06-01 15:14:30 UTC (rev 915)
@@ -36,6 +36,11 @@
* Small change for libc6 upgrade problem.
- debian/debhelper.in/libc.postrm: Add plain messages and clean up.
+ * Add conflicts to old initrd-tools for avoiding new glibc 2.3.4/5 ldd
+ blocks to generate initrd images. Suggested by Goswin von Brederlow
+ <brederlo@informatik.uni-tuebingen.de>.
+ - debian/sysdeps/depflags.pl: Add conflicts initrd-tools (<< 0.1.79).
+
* A Costa <agcosta@gis.net>. (Closes: #305662, #305666)
- debian/local/manpages/tzconfig.8: Fixed typo.
- debian/local/manpages/ldconfig.8: Likewise.
Modified: glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl
===================================================================
--- glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl 2005-05-27 15:26:09 UTC (rev 914)
+++ glibc-package/branches/glibc-2.3.4/debian/sysdeps/depflags.pl 2005-06-01 15:14:30 UTC (rev 915)
@@ -143,6 +143,9 @@
# Replace libc-dev (<< 2.3.5-2) for fixing #280030.
push @{$libc_c{'Replaces'}}, "${libc}-dev (<< 2.3.5-2)";
+# Conflict old initrd-tools (<< 0.1.79) that cannot work with new ldd.
+push @{$libc_c{'Conflicts'}}, 'initrd-tools (<< 0.1.79)';
+
# 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';
Reply to: