mutt (1.5.15+20070412-1) experimental; urgency=low

  * New snapshot:
    + Avoid altering the argument to mutt_complete() when completion fails.
      Mutt: #2871, Closes: #367405
    + Allow reply-hook to use ~h when replying from the index.
      Mutt: #2866, Closes: #362919
    + Exit with a nonzero value if sending a message in batch mode fails.
      Mutt: #2709, Closes: #273137
    + Make mutt more posixly-correct. Mutt: #1615, Closes: #204904

diff --git a/debian/changelog b/debian/changelog
index 91470e8ee4696a844f697de3266846ba65abbe87..7429027d5431d4a6064728dded00d2dfc56fb89e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+mutt (1.5.15+20070412-1) experimental; urgency=low
+
+  * New snapshot:
+    + Avoid altering the argument to mutt_complete() when completion fails.
+      Mutt: #2871, Closes: #367405
+    + Allow reply-hook to use ~h when replying from the index.
+      Mutt: #2866, Closes: #362919
+    + Exit with a nonzero value if sending a message in batch mode fails.
+      Mutt: #2709, Closes: #273137
+    + Make mutt more posixly-correct. Mutt: #1615, Closes: #204904
+
+ -- Christoph Berg <myon@debian.org>  Thu, 12 Apr 2007 17:04:05 +0000
+
 mutt (1.5.14+cvs20070403-1) experimental; urgency=low
 
   * set ssl_ca_certificates_file="/etc/ssl/certs/ca-certificates.crt".

diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index cae3fb3b3cf4b3e143505fd6ee42f0138e2600f5..82da4bd88b9f244b4c9537f9d579f4cddee2ae61 100644 (file)
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -21,7 +21,7 @@ The home page for this patch is:
 Index: debian-mutt/compress.c
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/compress.c     2007-03-21 21:28:21.000000000 +0100
++++ debian-mutt/compress.c     2007-04-12 18:56:02.000000000 +0200
 @@ -0,0 +1,499 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -525,7 +525,7 @@ Index: debian-mutt/compress.c
 Index: debian-mutt/compress.h
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/compress.h     2007-03-21 21:28:21.000000000 +0100
++++ debian-mutt/compress.h     2007-04-12 18:56:02.000000000 +0200
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -556,8 +556,8 @@ Index: debian-mutt/compress.h
 +void mutt_fast_close_compressed (CONTEXT *);
 Index: debian-mutt/configure.ac
 ===================================================================
---- debian-mutt.orig/configure.ac      2007-03-21 21:25:18.000000000 +0100
-+++ debian-mutt/configure.ac   2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/configure.ac      2007-04-12 18:15:14.000000000 +0200
++++ debian-mutt/configure.ac   2007-04-12 18:56:02.000000000 +0200
 @@ -803,6 +803,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
@@ -572,9 +572,9 @@ Index: debian-mutt/configure.ac
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
 Index: debian-mutt/curs_main.c
 ===================================================================
---- debian-mutt.orig/curs_main.c       2007-03-20 22:52:50.000000000 +0100
-+++ debian-mutt/curs_main.c    2007-03-21 21:28:21.000000000 +0100
-@@ -1090,6 +1090,11 @@ int mutt_index_menu (void)
+--- debian-mutt.orig/curs_main.c       2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/curs_main.c    2007-04-12 18:56:02.000000000 +0200
+@@ -1096,6 +1096,11 @@ int mutt_index_menu (void)
          {
          int check;
  
@@ -588,8 +588,8 @@ Index: debian-mutt/curs_main.c
  
 Index: debian-mutt/doc/manual.xml.head
 ===================================================================
---- debian-mutt.orig/doc/manual.xml.head       2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/doc/manual.xml.head    2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/doc/manual.xml.head       2007-04-07 14:44:33.000000000 +0200
++++ debian-mutt/doc/manual.xml.head    2007-04-12 18:56:02.000000000 +0200
 @@ -4910,6 +4910,205 @@ becomes an issue as mutt will silently f
  
  </chapter>
@@ -798,8 +798,8 @@ Index: debian-mutt/doc/manual.xml.head
  
 Index: debian-mutt/doc/muttrc.man.head
 ===================================================================
---- debian-mutt.orig/doc/muttrc.man.head       2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/doc/muttrc.man.head    2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/doc/muttrc.man.head       2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/doc/muttrc.man.head    2007-04-12 18:56:02.000000000 +0200
 @@ -345,6 +345,24 @@ specify the ID of the public key to be u
  to a certain recipient.  The meaning of "key ID" is to be taken
  broadly: This can be a different e-mail address, a numerical key ID,
@@ -827,8 +827,8 @@ Index: debian-mutt/doc/muttrc.man.head
  This command adds the named \fIstring\fP to the keyboard buffer.
 Index: debian-mutt/hook.c
 ===================================================================
---- debian-mutt.orig/hook.c    2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/hook.c 2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/hook.c    2007-04-12 18:15:14.000000000 +0200
++++ debian-mutt/hook.c 2007-04-12 18:56:02.000000000 +0200
 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"
@@ -859,9 +859,9 @@ Index: debian-mutt/hook.c
        )
 Index: debian-mutt/init.h
 ===================================================================
---- debian-mutt.orig/init.h    2007-03-21 21:26:23.000000000 +0100
-+++ debian-mutt/init.h 2007-03-21 21:28:21.000000000 +0100
-@@ -3115,6 +3115,11 @@ struct command_t Commands[] = {
+--- debian-mutt.orig/init.h    2007-04-12 18:15:14.000000000 +0200
++++ debian-mutt/init.h 2007-04-12 18:56:02.000000000 +0200
+@@ -3128,6 +3128,11 @@ struct command_t Commands[] = {
    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },
@@ -875,9 +875,9 @@ Index: debian-mutt/init.h
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
 Index: debian-mutt/main.c
 ===================================================================
---- debian-mutt.orig/main.c    2007-03-20 22:52:50.000000000 +0100
-+++ debian-mutt/main.c 2007-03-21 21:28:21.000000000 +0100
-@@ -400,6 +400,12 @@ static void show_version (void)
+--- debian-mutt.orig/main.c    2007-04-12 18:15:14.000000000 +0200
++++ debian-mutt/main.c 2007-04-12 18:56:02.000000000 +0200
+@@ -401,6 +401,12 @@ static void show_version (void)
  #else
        "-LOCALES_HACK  "
  #endif
@@ -892,8 +892,8 @@ Index: debian-mutt/main.c
        "+HAVE_WC_FUNCS  "
 Index: debian-mutt/Makefile.am
 ===================================================================
---- debian-mutt.orig/Makefile.am       2007-03-21 21:25:18.000000000 +0100
-+++ debian-mutt/Makefile.am    2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/Makefile.am       2007-04-07 14:44:20.000000000 +0200
++++ debian-mutt/Makefile.am    2007-04-12 18:56:02.000000000 +0200
 @@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
@@ -914,8 +914,8 @@ Index: debian-mutt/Makefile.am
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
 Index: debian-mutt/mbox.c
 ===================================================================
---- debian-mutt.orig/mbox.c    2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/mbox.c 2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/mbox.c    2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/mbox.c 2007-04-12 18:56:02.000000000 +0200
 @@ -29,6 +29,10 @@
  #include "copy.h"
  #include "mutt_curses.h"
@@ -942,8 +942,8 @@ Index: debian-mutt/mbox.c
    return 0;
 Index: debian-mutt/mutt.h
 ===================================================================
---- debian-mutt.orig/mutt.h    2007-03-20 22:52:50.000000000 +0100
-+++ debian-mutt/mutt.h 2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/mutt.h    2007-04-12 18:15:14.000000000 +0200
++++ debian-mutt/mutt.h 2007-04-12 18:56:02.000000000 +0200
 @@ -160,6 +160,11 @@ typedef enum
  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
@@ -956,9 +956,9 @@ Index: debian-mutt/mutt.h
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1
-@@ -886,6 +891,11 @@ typedef struct
-   void *data;                 /* driver specific data */
- #endif /* USE_IMAP */
+@@ -885,6 +890,11 @@ typedef struct _context
+   int flagged;                        /* how many flagged messages */
+   int msgnotreadyet;          /* which msg "new" in pager, -1 if none */
  
 +#ifdef USE_COMPRESSED
 +  void *compressinfo;         /* compressed mbox module private data */
@@ -970,8 +970,8 @@ Index: debian-mutt/mutt.h
    unsigned char rights[(RIGHTSMAX + 7)/8];    /* ACL bits */
 Index: debian-mutt/mx.c
 ===================================================================
---- debian-mutt.orig/mx.c      2007-03-21 21:25:18.000000000 +0100
-+++ debian-mutt/mx.c   2007-03-21 21:29:55.000000000 +0100
+--- debian-mutt.orig/mx.c      2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/mx.c   2007-04-12 18:56:02.000000000 +0200
 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"
@@ -1022,7 +1022,7 @@ Index: debian-mutt/mx.c
    if(ctx->magic == 0)
      mutt_error (_("%s is not a mailbox."), path);
  
-@@ -758,6 +778,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
+@@ -753,6 +773,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
      mutt_free_header (&ctx->hdrs[i]);
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);
@@ -1033,7 +1033,7 @@ Index: debian-mutt/mx.c
    FREE (&ctx->path);
    FREE (&ctx->pattern);
    if (ctx->limit_pattern) 
-@@ -810,6 +834,12 @@ static int sync_mailbox (CONTEXT *ctx, i
+@@ -805,6 +829,12 @@ static int sync_mailbox (CONTEXT *ctx, i
    
    if (tmp && tmp->new == 0)
      mutt_update_mailbox (tmp);
@@ -1046,7 +1046,7 @@ Index: debian-mutt/mx.c
    return rc;
  }
  
-@@ -1011,6 +1041,11 @@ int mx_close_mailbox (CONTEXT *ctx, int 
+@@ -1006,6 +1036,11 @@ int mx_close_mailbox (CONTEXT *ctx, int 
        !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
      mx_unlink_empty (ctx->path);
  
@@ -1058,7 +1058,7 @@ Index: debian-mutt/mx.c
    mx_fastclose_mailbox (ctx);
  
    return 0;
-@@ -1320,6 +1355,11 @@ int mx_check_mailbox (CONTEXT *ctx, int 
+@@ -1315,6 +1350,11 @@ int mx_check_mailbox (CONTEXT *ctx, int 
  {
    int rc;
  
@@ -1072,8 +1072,8 @@ Index: debian-mutt/mx.c
      if (ctx->locked) lock = 0;
 Index: debian-mutt/mx.h
 ===================================================================
---- debian-mutt.orig/mx.h      2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/mx.h   2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/mx.h      2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/mx.h   2007-04-12 18:56:02.000000000 +0200
 @@ -40,6 +40,9 @@ enum
  #ifdef USE_POP
    , M_POP
@@ -1087,14 +1087,14 @@ Index: debian-mutt/mx.h
 Index: debian-mutt/PATCHES
 ===================================================================
 --- /dev/null  1970-01-01 00:00:00.000000000 +0000
-+++ debian-mutt/PATCHES        2007-03-21 21:28:21.000000000 +0100
++++ debian-mutt/PATCHES        2007-04-12 18:56:02.000000000 +0200
 @@ -0,0 +1 @@
 +patch-1.5.14.rr.compressed.1
 Index: debian-mutt/po/de.po
 ===================================================================
---- debian-mutt.orig/po/de.po  2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/po/de.po       2007-03-21 21:28:21.000000000 +0100
-@@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl
+--- debian-mutt.orig/po/de.po  2007-04-07 14:44:33.000000000 +0200
++++ debian-mutt/po/de.po       2007-04-12 18:56:02.000000000 +0200
+@@ -1280,6 +1280,48 @@ msgstr "Prüfung des Absenders fehlgeschl
  msgid "Failed to figure out sender"
  msgstr "Kann Absender nicht ermitteln"
  
@@ -1143,18 +1143,7 @@ Index: debian-mutt/po/de.po
  #: crypt.c:69
  #, c-format
  msgid " (current time: %c)"
-@@ -1926,6 +1968,10 @@ msgstr ""
- msgid "Help for %s"
- msgstr "Hilfe für %s"
- 
-+#: hook.c:96
-+msgid "bad formatted command string"
-+msgstr "Hook enthält nicht die Muster %f und %t"
-+
- #: hook.c:246
- #, c-format
- msgid "unhook: Can't do unhook * from within a hook."
-@@ -3428,18 +3474,10 @@ msgstr "Lese %s..."
+@@ -3437,18 +3479,10 @@ msgstr "Lese %s..."
  msgid "Mailbox is corrupt!"
  msgstr "Mailbox fehlerhaft!"
  
@@ -1175,8 +1164,8 @@ Index: debian-mutt/po/de.po
  #. * never happen, is we presume it is a bug in mutt.
 Index: debian-mutt/po/POTFILES.in
 ===================================================================
---- debian-mutt.orig/po/POTFILES.in    2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/po/POTFILES.in 2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/po/POTFILES.in    2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/po/POTFILES.in 2007-04-12 18:56:02.000000000 +0200
 @@ -8,6 +8,7 @@ charset.c
  color.c
  commands.c
@@ -1187,8 +1176,8 @@ Index: debian-mutt/po/POTFILES.in
  cryptglue.c
 Index: debian-mutt/status.c
 ===================================================================
---- debian-mutt.orig/status.c  2007-03-20 22:31:20.000000000 +0100
-+++ debian-mutt/status.c       2007-03-21 21:28:21.000000000 +0100
+--- debian-mutt.orig/status.c  2007-04-03 21:43:38.000000000 +0200
++++ debian-mutt/status.c       2007-04-12 18:56:02.000000000 +0200
 @@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
  
      case 'f':