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 68da5d59b5ca7639cdb1369504d8208723688403..e35deff2ea5fe0245c7a06fce9a5eba5987fd1b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,38 @@
+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:35:03 +0200
+
 mutt (1.5.18-2) unstable; urgency=low
 
+  * Updated sidebar patch, does not display (NULL) anymore. (Closes: #483151)
   * Install reportbug script to inform us about the status of installed
     mutt packages.
+  * Use dh_lintian (prefix with '-' so we do not need to bump the DH level).
+  * Register mutt as message/rfc822 application in /etc/mailcap.
+    (Closes: #474539)
+  * Refresh some patches to get rid of -p0 in series file.
+  * Bump Standards-Version; add debian/README.source.
+  * Switch Maintainer and Uploader as suggested by Dato.
 
- -- Christoph Berg <myon@debian.org>  Mon, 26 May 2008 22:17:05 +0200
+ -- Christoph Berg <myon@debian.org>  Thu, 12 Jun 2008 23:53:46 +0200
 
 mutt (1.5.18-1) unstable; urgency=low
 
@@ -13,7 +42,9 @@ mutt (1.5.18-1) unstable; urgency=low
       (Closes: #351890, Mutt: #1719)
     + Mention that References: and Date: cannot be changed in editor.
       (Closes: #191850, Mutt: #1234).
-  * Refreshing patches from upstream: compressed-folders, sidebar.
+  * Refreshing patches from upstream:
+    + compressed-folders.
+    + sidebar. (Closes: #470657)
   * Update doc-base section.
 
  -- Christoph Berg <myon@debian.org>  Sat, 24 May 2008 19:36:44 +0200