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 318bb5498a704a05580b655872e5e346e8206ce1..e35deff2ea5fe0245c7a06fce9a5eba5987fd1b4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,76 @@
-mutt (1.5.17-2) experimental; urgency=low
+mutt (1.5.18-4) unstable; urgency=low
 
-  * Build a mutt-dbg package, and bump DH level to 5.
+  * 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>  Thu, 12 Jun 2008 23:53:46 +0200
+
+mutt (1.5.18-1) unstable; urgency=low
 
- -- Christoph Berg <myon@debian.org>  Sun, 04 Nov 2007 13:32:44 +0100
+  * New upstream version.
+    + Query menu format is configurable. (Closes: #66096, Mutt: #170)
+    + Quote attachment filenames starting with '='.
+      (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. (Closes: #470657)
+  * Update doc-base section.
+
+ -- Christoph Berg <myon@debian.org>  Sat, 24 May 2008 19:36:44 +0200
+
+mutt (1.5.17+20080114-1) unstable; urgency=low
+
+  * New upstream snapshot (hg 130aa0517251), and this time build a proper
+    orig.tar.gz tarball.
+    + Fixes message corruption/duplication. (Closes: #459739)
+
+ -- Christoph Berg <myon@debian.org>  Mon, 14 Jan 2008 23:26:14 +0100
+
+mutt (1.5.17-2) unstable; urgency=low
+
+  * Build a mutt-patched package to apply the sidebar patch. Thanks to Dato
+    who had the right idea for the necessary debian/rules magic during the
+    recent debian-qa meeting in Extremadura. (Closes: #277637)
+  * Build a mutt-dbg package, and bump DH level to 5.
+  * Grab current hg tip from upstream (68a9c3e74f9a).
+    + Fixes "mailto:" URL parsing.
+      (Closes: #426148, #426158, #446016, Mutt: #2968, #2980)
+    + 'set folder= =' won't segfault. (Closes: #448728)
+    + Improve DSN docs. (Closes: #436228)
+  * Bump Standards-Version, add Homepage field.
+
+ -- Christoph Berg <myon@debian.org>  Tue, 01 Jan 2008 20:00:33 +0100
 
 mutt (1.5.17-1) unstable; urgency=low