Import mutt_1.5.11+cvs20060126-2

diff --git a/debian/changelog b/debian/changelog
index 9f7a1e493d25aa91755ebf6be4161ecda32b4b69..69e69bdee936118c3fa206a1655d6d3a871cd39b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+mutt (1.5.11+cvs20060126-2) unstable; urgency=medium
+
+  * Make imap_idle default to off, since it does not work with dovecot from
+    stable, which a lot of people use; upstream will make this change before
+    1.5.12. (Closes: #351263, #354902)
+
+  * Ignore DKIM-Signature by default in /etc/Muttrc. (Closes: #354907)
+
+ -- Adeodato Simó <dato@net.com.org.es>  Thu,  2 Mar 2006 22:42:34 +0100
+
 mutt (1.5.11+cvs20060126-1) unstable; urgency=low
 
   * Update to CVS 2006-01-26; since this includes a huge diff between

diff --git a/debian/patches/debian-specific/Md.Muttrc.diff b/debian/patches/debian-specific/Md.Muttrc.diff
index 792ab939ae6bda1cf21f9ff32b4399fcb055950d..aa1ba07b22a4ffe08728b31f9689c10abe554438 100644 (file)
--- a/debian/patches/debian-specific/Md.Muttrc.diff
+++ b/debian/patches/debian-specific/Md.Muttrc.diff
@@ -1,5 +1,5 @@
---- mutt-1.5.11.orig/Muttrc.head.in
-+++ mutt-1.5.11/Muttrc.head.in
+--- mutt-1.5.11+cvs20060126.orig/Muttrc.head.in
++++ mutt-1.5.11+cvs20060126/Muttrc.head.in
 @@ -6,6 +6,38 @@
  #
  ignore "from " received content- mime-version status x-status message-id
@@ -7,7 +7,7 @@
 +ignore date delivered-to precedence errors-to in-reply-to user-agent
 +ignore x-loop x-sender x-mailer x-msmail-priority x-mimeole x-ms- x-priority
 +ignore x-accept-language x-authentication-warning thread- priority importance
-+ignore x-original-to domainkey-signature
++ignore x-original-to domainkey-signature dkim-signature
 +
 +# emacs-like bindings
 +bind editor    "\e<delete>"    kill-word

diff --git a/debian/patches/misc/imap_idle_default_off.diff b/debian/patches/misc/imap_idle_default_off.diff
new file mode 100644 (file)
index 0000000..60f5806
--- /dev/null
+++ b/debian/patches/misc/imap_idle_default_off.diff
@@ -0,0 +1,11 @@
+--- init.h.orig
++++ init.h
+@@ -886,7 +886,7 @@
+   ** your INBOX in the IMAP browser. If you see something else, you may set
+   ** this variable to the IMAP path to your folders.
+   */
+-  { "imap_idle",                DT_BOOL, R_NONE, OPTIMAPIDLE, 1 },
++  { "imap_idle",                DT_BOOL, R_NONE, OPTIMAPIDLE, 0 },
+   /*
+    ** .pp
+    ** When \fIset\fP, mutt will attempt to use the IMAP IDLE extension

diff --git a/debian/patches/series b/debian/patches/series
index e7726b583c63ba6d2b1f4e57ad2d0df5cde2930e..762334a86e9ae586f9033e210bddf2557a9d67f9 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,5 +18,6 @@ debian-specific/build_doc_adjustments.diff
 debian-specific/correct_docdir_in_man_page.diff 
 debian-specific/dont_document_not_present_features.diff
 
+misc/imap_idle_default_off.diff -p0
 misc/define-pgp_getkeys_command.diff
 misc/autotools-update.diff