* debian/patches/series:

  + upstream/533209-mutt_perror.patch: better error reporting if a mailbox
    cannot be opened (Closes: 533209)

diff --git a/debian/changelog b/debian/changelog
index c0b2ea9fd832c5db452fcb59b5c80426f4f808f2..343183316bb767775db8859c6429590c29ac0f54 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutt (1.5.20-2) unstable; urgency=low
+
+  * debian/patches/series:
+    + upstream/533209-mutt_perror.patch: better error reporting if a mailbox
+      cannot be opened (Closes: 533209)
+
+ -- Antonio Radici <antonio@dyne.org>  Tue, 16 Jun 2009 23:20:32 +0100
+
 mutt (1.5.20-1) unstable; urgency=low
 
   * New upstream release, includes the following features:

diff --git a/debian/patches/series b/debian/patches/series
index 33ecf6e3231b2b2d09502f30ac1030e70e218d2c..60123f758dde3b4ab53eea66c47ed9e0a775bf93 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -40,6 +40,7 @@ misc/smime.rc
 #upstream/502628-attach_charset-doc.patch
 #upstream/504530-stunnel-account_hook-doc.patch
 #upstream/530887-dovecot-imap.patch
+upstream/533209-mutt_perror.patch
 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch

diff --git a/debian/patches/upstream/533209-mutt_perror.patch b/debian/patches/upstream/533209-mutt_perror.patch
new file mode 100644 (file)
index 0000000..9d7abcf
--- /dev/null
+++ b/debian/patches/upstream/533209-mutt_perror.patch
@@ -0,0 +1,13 @@
+mutt is calling mutt_perror twice, so the error messages are
+sometimes confused, see upstream #3268
+
+--- a/mx.c
++++ b/mx.c
+@@ -411,7 +411,6 @@
+   {
+     dprint (1, (debugfile, "mx_get_magic(): unable to open file %s for reading.\n",
+               path));
+-    mutt_perror (path);
+     return (-1);
+   }
+