Update debian changelog.

Declare comerr-dev as replacing << e2fslibs-dev 1.33-2, to avoid
        errors when upgrading to the new versions of comerr-dev and
        e2fslibs-dev

Declare init_error_table as taking a long for the second argument.

diff --git a/debian/changelog b/debian/changelog
index 8cdf496..669a092 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+e2fsprogs (1.33-3) unstable; urgency=low
+
+  * Add full Heimdall/Kerberos4-kth compatibility to com_err routines.
+  * Declare comerr-dev as replacing << e2fslibs-dev 1.33-2, to avoid
+    errors when upgrading to the new versions of comerr-dev and
+    e2fslibs-dev
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Tue,  6 May 2003 00:29:47 -0400
+
 e2fsprogs (1.33-2) unstable; urgency=low
 
   * Fix up NLS support

diff --git a/debian/control b/debian/control
index 8b12f9c..73981dc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Priority: extra
 Depends: ${libcdev:Depends}, libcomerr2
 Suggests: doc-base
 Conflicts: e2fsprogs (<< 1.10-6)
+Replaces: e2fslibs-dev (<< 1.33-2)
 Architecture: any
 Description: The Common Error Description library - headers and static libraries
  libcomerr is an attempt to present a common error-handling mechanism to

diff --git a/lib/et/com_err.h b/lib/et/com_err.h
index 49b2a26..1f34372 100644 (file)
--- a/lib/et/com_err.h
+++ b/lib/et/com_err.h
@@ -8,7 +8,7 @@
  * with this package.
  */
 
-#ifndef __COM_ERR_H
+#if !defined(__COM_ERR_H) && !defined(__COM_ERR_H__)
 
 #include <stdarg.h>
 
@@ -32,7 +32,7 @@ extern void (*set_com_err_hook (void (*) (const char *, long,
        (const char *, long, const char *, va_list);
 extern void (*reset_com_err_hook (void)) (const char *, long, 
                                          const char *, va_list);
-extern int init_error_table(const char * const *msgs, int base, int count);
+extern int init_error_table(const char * const *msgs, long base, int count);
 
 extern errcode_t add_error_table(const struct error_table * et);
 extern errcode_t remove_error_table(const struct error_table * et);
@@ -47,4 +47,5 @@ extern void initialize_error_table_r(struct et_list **list,
 extern void free_error_table(struct et_list *et);
 
 #define __COM_ERR_H
-#endif /* ! defined(__COM_ERR_H) */
+#define __COM_ERR_H__
+#endif /* !defined(__COM_ERR_H) && !defined(__COM_ERR_H__)*/

diff --git a/lib/et/init_et.c b/lib/et/init_et.c
index 0e30730..075d26a 100644 (file)
--- a/lib/et/init_et.c
+++ b/lib/et/init_et.c
@@ -31,7 +31,7 @@ struct foobar {
 
 extern struct et_list * _et_list;
 
-int init_error_table(const char * const *msgs, int base, int count)
+int init_error_table(const char * const *msgs, long base, int count)
 {
     struct foobar * new_et;