From 32e7608cf66262c093880e9f60daa361f22a898e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 8 May 2003 03:33:07 -0400 Subject: [PATCH] Update debian changelog Add replaces field to comerr-dev to resolve a file conflict with /usr/include/com_err.h and the libkrb5-dev package. (Closes: #192277) --- debian/changelog | 8 ++++++++ debian/control | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 669a0924..84372686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +e2fsprogs (1.33-4) unstable; urgency=low + + * Add replaces field to comerr-dev to resolve a file conflict with + /usr/include/com_err.h and the libkrb5-dev package. (Closes: #192277) + * Add -t option to badblocks to control the test pattern used. + + -- Theodore Y. Ts'o Thu, 8 May 2003 03:29:47 -0400 + e2fsprogs (1.33-3) unstable; urgency=low * Add full Heimdall/Kerberos4-kth compatibility to com_err routines. diff --git a/debian/control b/debian/control index 73981dcb..798a4e3d 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Priority: extra Depends: ${libcdev:Depends}, libcomerr2 Suggests: doc-base Conflicts: e2fsprogs (<< 1.10-6) -Replaces: e2fslibs-dev (<< 1.33-2) +Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3) Architecture: any Description: The Common Error Description library - headers and static libraries libcomerr is an attempt to present a common error-handling mechanism to