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)

diff --git a/debian/changelog b/debian/changelog
index 669a0924d909c5794488d8416ec1548575e1488d..84372686c2c48e01257e707f88c2e18934cdc131 100644 (file)
--- 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 <tytso@mit.edu>  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 73981dcbc77b3a3ea105fab8a3a42d9cd534ec0d..798a4e3d5ae9c9862062aa037f1a14231357f63d 100644 (file)
--- 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