Introduce two new patches that revert the conflicting part of the

[software/mutt-debian.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 40cd967cfa4d06d63e6b6fe0a96d5a006ab9ef22..e35deff2ea5fe0245c7a06fce9a5eba5987fd1b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,24 @@
+mutt (1.5.18-4) unstable; urgency=low
+
+  * In order to evade a conflict with the sidebar patch, move the set_xterm_*
+    prototypes from pager.c to mutt_menu.h. No functional change.
+  * Introduce two new patches that revert the conflicting part of the
+    maildir-mtime patch before applying the sidebar patch, and afterwards
+    re-apply the relevant bits. This mitigates the chance of bugs being
+    introduced when manually resolving conflicts with new versions of the
+    sidebar patch. This fixes new mail detection in the mutt-patched package.
+    (Closes: #484537, #484538)
+
+ -- Christoph Berg <myon@debian.org>  Sun, 03 Aug 2008 00:51:58 +0200
+
 mutt (1.5.18-3) unstable; urgency=low
 
   * Pull patch from upstream to fix multipart decoding. (Closes: #489283)
   * Add example sidebar config, thanks Stefano Zacchiroli. (Closes: #460452)
   * (Finally) compile with native Kerberos GSSAPI support. (Closes: #469483)
+  * Add a switch in debian/rules to make building mutt-patched configurable.
 
- -- Christoph Berg <myon@debian.org>  Sun, 20 Jul 2008 01:06:46 +0200
+ -- Christoph Berg <myon@debian.org>  Sun, 20 Jul 2008 01:35:03 +0200
 
 mutt (1.5.18-2) unstable; urgency=low