Import mutt_1.5.11+cvs20060330-1

diff --git a/debian/changelog b/debian/changelog
index 69e69bdee936118c3fa206a1655d6d3a871cd39b..f21670b85dfd609320ae81d868bd67bbc078a4fb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+mutt (1.5.11+cvs20060330-1) unstable; urgency=low
+
+  * Update to CVS 2006-03-30, which fixes the following bugs:
+    + IMAP cache works again with Courier. (Closes: #351220)
+    + does not segfault if external query command output contains spaces.
+      (Closes: #351258)
+    + does not segfault when replying from the view-attachments menu when a
+      reply-hook is in use. (Closes: #352357)
+    + default save location for attachments which specify a path in their name
+      is not `dirname $attachment` anymore, but $CWD. (Closes: #301236)
+  
+  * Switch to libdb4.4. (Closes: #355433)
+
+ -- Adeodato Simó <dato@net.com.org.es>  Mon,  3 Apr 2006 02:41:15 +0200
+
 mutt (1.5.11+cvs20060126-2) unstable; urgency=medium
 
   * Make imap_idle default to off, since it does not work with dovecot from

diff --git a/debian/control b/debian/control
index fedd92e0e56bd4f4efa8049478d770e68a7d4130..970dde10afd5c1d9acc867c9915ad0024117aedc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: mutt
 Section: mail
 Priority: standard
 Maintainer: Adeodato Simó <dato@net.com.org.es>
-Build-Depends: debhelper, quilt, autotools-dev, gawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.3-dev
+Build-Depends: debhelper, quilt, autotools-dev, gawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.4-dev
 Standards-Version: 3.6.2
 
 Package: mutt

diff --git a/debian/patches/misc/imap_idle_default_off.diff b/debian/patches/misc/imap_idle_default_off.diff
deleted file mode 100644 (file)
index 60f5806..0000000
--- a/debian/patches/misc/imap_idle_default_off.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 762334a86e9ae586f9033e210bddf2557a9d67f9..e7726b583c63ba6d2b1f4e57ad2d0df5cde2930e 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,6 +18,5 @@ 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

diff --git a/debian/patches/version.diff b/debian/patches/version.diff
index c2201977fe1b5a9d4beaa55e910e03d6f1bf37e5..02bd2d3dc639ed3562b3c5d35b929fff0407b120 100644 (file)
--- a/debian/patches/version.diff
+++ b/debian/patches/version.diff
@@ -2,9 +2,9 @@
 +++ mutt-1.5.11+cvs20060126/VERSION
 @@ -1 +1 @@
 -1.5.11
-+1.5.11+cvs20060126
++1.5.11+cvs20060330
 --- mutt-1.5.11+cvs20060126.orig/reldate.h
 +++ mutt-1.5.11+cvs20060126/reldate.h
 @@ -1 +1 @@
 -const char *ReleaseDate = "2005-09-15";
-+const char *ReleaseDate = "2006-01-26";
++const char *ReleaseDate = "2006-03-30";