refreshed a bunch of patches

diff --git a/debian/patches/debian-specific/document_debian_defaults b/debian/patches/debian-specific/document_debian_defaults
index 8d97e29becdbcd65efcff97acf394fca873bf79d..7240bef2de08690ca71e289676daf4b61d7fb84a 100644 (file)
--- a/debian/patches/debian-specific/document_debian_defaults
+++ b/debian/patches/debian-specific/document_debian_defaults
@@ -1,8 +1,10 @@
 Some customization of the option which are straying from the default
 only on Debian systems
 
---- a/init.h
-+++ b/init.h
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:35.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:36.000000000 +0200
 @@ -312,6 +312,9 @@
    ** .pp
    ** When this variable is \fIset\fP, mutt will include Delivered-To headers when
@@ -23,7 +25,7 @@ only on Debian systems
    */
    { "ignore_linear_white_space",    DT_BOOL, R_NONE, OPTIGNORELWS, 0 },
    /*
-@@ -1564,6 +1570,9 @@
+@@ -1554,6 +1560,9 @@
    ** system.  It is used with various sets of parameters to gather the
    ** list of known remailers, and to finally send a message through the
    ** mixmaster chain.
@@ -33,7 +35,7 @@ only on Debian systems
    */
  #endif
    { "move",           DT_QUAD, R_NONE, OPT_MOVE, M_NO },
-@@ -2580,6 +2589,10 @@
+@@ -2570,6 +2579,10 @@
    ** This variable contains the name of either a directory, or a file which
    ** contains trusted certificates for use with OpenSSL.
    ** (S/MIME only)
@@ -44,7 +46,7 @@ only on Debian systems
    */
    { "smime_certificates",     DT_PATH, R_NONE, UL &SmimeCertificates, 0 },
    /*
-@@ -2786,6 +2799,9 @@
+@@ -2776,6 +2789,9 @@
    ** .ts
    ** set smtp_authenticators="digest-md5:cram-md5"
    ** .te
@@ -54,7 +56,7 @@ only on Debian systems
    */
  # endif /* USE_SASL */
    { "smtp_pass",      DT_STR,  R_NONE, UL &SmtpPass, UL 0 },
-@@ -2833,6 +2849,9 @@
+@@ -2823,6 +2839,9 @@
    ** .pp
    ** You may optionally use the ``reverse-'' prefix to specify reverse sorting
    ** order (example: ``\fCset sort=reverse-date-sent\fP'').
@@ -64,7 +66,7 @@ only on Debian systems
    */
    { "sort_alias",     DT_SORT|DT_SORT_ALIAS,  R_NONE, UL &SortAlias, SORT_ALIAS },
    /*
-@@ -3358,6 +3377,9 @@
+@@ -3348,6 +3367,9 @@
    ** is set to deliver directly via SMTP (see $$smtp_url), this
    ** option does nothing: mutt will never write out the ``Bcc:'' header
    ** in this case.

diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
index e3989f74027deb9a78cda6e465f3cab8de7064d6..cb91b5fd7ef31c9696e1f2db209aab0d2c722a61 100644 (file)
--- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
+++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
@@ -1,7 +1,9 @@
 Enable pgp_mime_signature_filename and pgp_mime_signature_description
 
---- a/globals.h
-+++ b/globals.h
+Index: mutt/globals.h
+===================================================================
+--- mutt.orig/globals.h        2009-06-25 12:35:48.000000000 +0200
++++ mutt/globals.h     2009-06-25 12:36:22.000000000 +0200
 @@ -242,6 +242,8 @@
  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
@@ -11,9 +13,11 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
  
  /*-- formerly in smime.h --*/
  WHERE char *SmimeDefaultKey;
---- a/init.h
-+++ b/init.h
-@@ -2551,6 +2551,18 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:35:48.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:22.000000000 +0200
+@@ -2541,6 +2541,18 @@
    ** a line quoted text if it also matches $$smileys. This mostly
    ** happens at the beginning of a line.
    */
@@ -32,8 +36,10 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
  
  
  
---- a/pgp.c
-+++ b/pgp.c
+Index: mutt/pgp.c
+===================================================================
+--- mutt.orig/pgp.c    2009-06-25 12:35:36.000000000 +0200
++++ mutt/pgp.c 2009-06-25 12:36:22.000000000 +0200
 @@ -1131,6 +1131,8 @@
    t->disposition = DISPINLINE;
    t->encoding = ENC7BIT;

diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index 8c38b9d9d6f3ffa388985e122f90ed148f1c5a67..40460162bbd4b24797fa5af3d49b6674d2a030f7 100644 (file)
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -17,8 +17,10 @@ The home page for this patch is:
   - 2009-09-15 scotton: removed doc/Muttrc for mutt-1.5.19 (only patch doc/Muttrc.head)
 
 == END PATCH
---- /dev/null
-+++ b/compress.c
+Index: mutt/compress.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ mutt/compress.c    2009-06-25 12:36:25.000000000 +0200
 @@ -0,0 +1,499 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -519,8 +521,10 @@ The home page for this patch is:
 +}
 +
 +#endif /* USE_COMPRESSED */
---- /dev/null
-+++ b/compress.h
+Index: mutt/compress.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ mutt/compress.h    2009-06-25 12:36:26.000000000 +0200
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -549,8 +553,10 @@ The home page for this patch is:
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);
---- a/configure.ac
-+++ b/configure.ac
+Index: mutt/configure.ac
+===================================================================
+--- mutt.orig/configure.ac     2009-06-25 12:35:38.000000000 +0200
++++ mutt/configure.ac  2009-06-25 12:36:26.000000000 +0200
 @@ -805,6 +805,11 @@
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
@@ -563,8 +569,10 @@ The home page for this patch is:
  AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]),
          [if test $withval != yes; then
                  AC_DEFINE_UNQUOTED(EXECSHELL, "$withval",
---- a/curs_main.c
-+++ b/curs_main.c
+Index: mutt/curs_main.c
+===================================================================
+--- mutt.orig/curs_main.c      2009-06-25 12:36:14.000000000 +0200
++++ mutt/curs_main.c   2009-06-25 12:36:26.000000000 +0200
 @@ -1135,6 +1135,11 @@
          {
          int check;
@@ -577,8 +585,10 @@ The home page for this patch is:
          mutt_str_replace (&LastFolder, Context->path);
          oldcount = Context ? Context->msgcount : 0;
  
---- a/doc/manual.xml.head
-+++ b/doc/manual.xml.head
+Index: mutt/doc/manual.xml.head
+===================================================================
+--- mutt.orig/doc/manual.xml.head      2009-06-25 12:35:42.000000000 +0200
++++ mutt/doc/manual.xml.head   2009-06-25 12:36:26.000000000 +0200
 @@ -5678,6 +5678,205 @@
  
  </chapter>
@@ -785,8 +795,10 @@ The home page for this patch is:
  <chapter id="mimesupport">
  <title>Mutt's MIME Support</title>
  
---- a/doc/Muttrc.head
-+++ b/doc/Muttrc.head
+Index: mutt/doc/Muttrc.head
+===================================================================
+--- mutt.orig/doc/Muttrc.head  2009-06-25 12:35:36.000000000 +0200
++++ mutt/doc/Muttrc.head       2009-06-25 12:36:26.000000000 +0200
 @@ -29,6 +29,11 @@
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
  bind browser y exit
@@ -799,8 +811,10 @@ The home page for this patch is:
  # If Mutt is unable to determine your site's domain name correctly, you can
  # set the default here.
  #
---- a/doc/muttrc.man.head
-+++ b/doc/muttrc.man.head
+Index: mutt/doc/muttrc.man.head
+===================================================================
+--- mutt.orig/doc/muttrc.man.head      2009-06-25 12:35:36.000000000 +0200
++++ mutt/doc/muttrc.man.head   2009-06-25 12:36:26.000000000 +0200
 @@ -345,6 +345,24 @@
  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,
@@ -826,8 +840,10 @@ The home page for this patch is:
  .TP
  \fBpush\fP \fIstring\fP
  This command adds the named \fIstring\fP to the keyboard buffer.
---- a/hook.c
-+++ b/hook.c
+Index: mutt/hook.c
+===================================================================
+--- mutt.orig/hook.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/hook.c        2009-06-25 12:36:26.000000000 +0200
 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"
@@ -856,9 +872,11 @@ The home page for this patch is:
    else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK))
             && (!WithCrypto || !(data & M_CRYPTHOOK))
        )
---- a/init.h
-+++ b/init.h
-@@ -3514,6 +3514,11 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:22.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:26.000000000 +0200
+@@ -3504,6 +3504,11 @@
    { "fcc-hook",               mutt_parse_hook,        M_FCCHOOK },
    { "fcc-save-hook",  mutt_parse_hook,        M_FCCHOOK | M_SAVEHOOK },
    { "folder-hook",    mutt_parse_hook,        M_FOLDERHOOK },
@@ -870,8 +888,10 @@ The home page for this patch is:
    { "group",          parse_group,            0 },
    { "ungroup",                parse_ungroup,          0 },
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
---- a/main.c
-+++ b/main.c
+Index: mutt/main.c
+===================================================================
+--- mutt.orig/main.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/main.c        2009-06-25 12:36:26.000000000 +0200
 @@ -402,6 +402,12 @@
  #else
        "-LOCALES_HACK  "
@@ -885,8 +905,10 @@ The home page for this patch is:
              
  #ifdef HAVE_WC_FUNCS
        "+HAVE_WC_FUNCS  "
---- a/Makefile.am
-+++ b/Makefile.am
+Index: mutt/Makefile.am
+===================================================================
+--- mutt.orig/Makefile.am      2009-06-25 12:35:36.000000000 +0200
++++ mutt/Makefile.am   2009-06-25 12:36:26.000000000 +0200
 @@ -18,7 +18,7 @@
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = \
@@ -905,8 +927,10 @@ The home page for this patch is:
        attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \
        globals.h hash.h history.h init.h keymap.h mutt_crypt.h \
        mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \
---- a/mbox.c
-+++ b/mbox.c
+Index: mutt/mbox.c
+===================================================================
+--- mutt.orig/mbox.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/mbox.c        2009-06-25 12:36:26.000000000 +0200
 @@ -29,6 +29,10 @@
  #include "copy.h"
  #include "mutt_curses.h"
@@ -931,8 +955,10 @@ The home page for this patch is:
    mutt_unblock_signals ();
    mx_fastclose_mailbox (ctx);
    return 0;
---- a/mutt.h
-+++ b/mutt.h
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:36:14.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:36:26.000000000 +0200
 @@ -146,6 +146,11 @@
  #define M_ACCOUNTHOOK (1<<9)
  #define M_REPLYHOOK   (1<<10)
@@ -945,7 +971,7 @@ The home page for this patch is:
  
  /* tree characters for linearize_tree and print_enriched_string */
  #define M_TREE_LLCORNER               1
-@@ -883,6 +888,11 @@
+@@ -882,6 +887,11 @@
    int flagged;                        /* how many flagged messages */
    int msgnotreadyet;          /* which msg "new" in pager, -1 if none */
  
@@ -957,8 +983,10 @@ The home page for this patch is:
    short magic;                        /* mailbox type */
  
    unsigned char rights[(RIGHTSMAX + 7)/8];    /* ACL bits */
---- a/mx.c
-+++ b/mx.c
+Index: mutt/mx.c
+===================================================================
+--- mutt.orig/mx.c     2009-06-25 12:36:14.000000000 +0200
++++ mutt/mx.c  2009-06-25 12:36:26.000000000 +0200
 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"
@@ -1057,8 +1085,10 @@ The home page for this patch is:
    if (ctx)
    {
      if (ctx->locked) lock = 0;
---- a/mx.h
-+++ b/mx.h
+Index: mutt/mx.h
+===================================================================
+--- mutt.orig/mx.h     2009-06-25 12:35:36.000000000 +0200
++++ mutt/mx.h  2009-06-25 12:36:26.000000000 +0200
 @@ -40,6 +40,9 @@
  #ifdef USE_POP
    , M_POP
@@ -1069,8 +1099,10 @@ The home page for this patch is:
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);
---- a/po/de.po
-+++ b/po/de.po
+Index: mutt/po/de.po
+===================================================================
+--- mutt.orig/po/de.po 2009-06-25 12:35:36.000000000 +0200
++++ mutt/po/de.po      2009-06-25 12:36:26.000000000 +0200
 @@ -2005,6 +2005,10 @@
  msgid "Bad history file format (line %d)"
  msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)"
@@ -1137,8 +1169,10 @@ The home page for this patch is:
 +#, c-format
 +msgid " %s: Error compressing mailbox!  Uncompressed one kept!\n"
 +msgstr " %s: Fehler beim packen der Mailbox! Entpackte Mailbox gespeichert!\n"
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
+Index: mutt/po/POTFILES.in
+===================================================================
+--- mutt.orig/po/POTFILES.in   2009-06-25 12:35:36.000000000 +0200
++++ mutt/po/POTFILES.in        2009-06-25 12:36:26.000000000 +0200
 @@ -8,6 +8,7 @@
  color.c
  commands.c
@@ -1147,8 +1181,10 @@ The home page for this patch is:
  crypt-gpgme.c
  crypt.c
  cryptglue.c
---- a/status.c
-+++ b/status.c
+Index: mutt/status.c
+===================================================================
+--- mutt.orig/status.c 2009-06-25 12:35:44.000000000 +0200
++++ mutt/status.c      2009-06-25 12:36:26.000000000 +0200
 @@ -96,6 +96,14 @@
  
      case 'f':

diff --git a/debian/patches/features/purge-message b/debian/patches/features/purge-message
index a509e1df316bfe4eba90375f9f261a078827e740..d16c0f27cf6ed1b132cbe75d316d8ba6fa772d6c 100644 (file)
--- a/debian/patches/features/purge-message
+++ b/debian/patches/features/purge-message
@@ -26,8 +26,10 @@ of having a trash folder feature.
   - Fixed indentation of "purged" in mutt.h.
 
 == END PATCH
---- a/OPS
-+++ b/OPS
+Index: mutt/OPS
+===================================================================
+--- mutt.orig/OPS      2009-06-25 12:35:37.000000000 +0200
++++ mutt/OPS   2009-06-25 12:36:14.000000000 +0200
 @@ -141,6 +141,7 @@
  OP_PREV_LINE "scroll up one line"
  OP_PREV_PAGE "move to the previous page"
@@ -36,8 +38,10 @@ of having a trash folder feature.
  OP_QUERY "query external program for addresses"
  OP_QUERY_APPEND "append new query results to current results"
  OP_QUIT "save changes to mailbox and quit"
---- a/curs_main.c
-+++ b/curs_main.c
+Index: mutt/curs_main.c
+===================================================================
+--- mutt.orig/curs_main.c      2009-06-25 12:35:44.000000000 +0200
++++ mutt/curs_main.c   2009-06-25 12:36:14.000000000 +0200
 @@ -1823,6 +1823,7 @@
        MAYBE_REDRAW (menu->redraw);
        break;
@@ -91,8 +95,10 @@ of having a trash folder feature.
        {
          if (option (OPTRESOLVE))
          {
---- a/flags.c
-+++ b/flags.c
+Index: mutt/flags.c
+===================================================================
+--- mutt.orig/flags.c  2009-06-25 12:35:48.000000000 +0200
++++ mutt/flags.c       2009-06-25 12:36:14.000000000 +0200
 @@ -104,6 +104,16 @@
        }
        break;
@@ -110,8 +116,10 @@ of having a trash folder feature.
      case M_NEW:
  
        if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
---- a/functions.h
-+++ b/functions.h
+Index: mutt/functions.h
+===================================================================
+--- mutt.orig/functions.h      2009-06-25 12:35:37.000000000 +0200
++++ mutt/functions.h   2009-06-25 12:36:14.000000000 +0200
 @@ -120,6 +120,7 @@
    { "toggle-write",           OP_TOGGLE_WRITE,                "%" },
    { "next-thread",            OP_MAIN_NEXT_THREAD,            "\016" },
@@ -128,8 +136,10 @@ of having a trash folder feature.
    { "quit",           OP_QUIT,                        "Q" },
    { "exit",           OP_EXIT,                        "q" },
    { "reply",          OP_REPLY,                       "r" },
---- a/mutt.h
-+++ b/mutt.h
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:35:48.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:36:14.000000000 +0200
 @@ -188,6 +188,7 @@
    M_UNDELETE,
    M_DELETED,
@@ -138,7 +148,7 @@ of having a trash folder feature.
    M_FLAG,
    M_TAG,
    M_UNTAG,
-@@ -705,6 +706,7 @@
+@@ -704,6 +705,7 @@
    unsigned int flagged : 1;           /* marked important? */
    unsigned int tagged : 1;
    unsigned int appended : 1;          /* has been saved */
@@ -146,8 +156,10 @@ of having a trash folder feature.
    unsigned int deleted : 1;
    unsigned int changed : 1;
    unsigned int attach_del : 1;                /* has an attachment marked for deletion */
---- a/mx.c
-+++ b/mx.c
+Index: mutt/mx.c
+===================================================================
+--- mutt.orig/mx.c     2009-06-25 12:36:10.000000000 +0200
++++ mutt/mx.c  2009-06-25 12:36:14.000000000 +0200
 @@ -803,6 +803,7 @@
      {
        for (i = 0 ; i < ctx->msgcount ; i++)
@@ -156,8 +168,10 @@ of having a trash folder feature.
            && mutt_append_message (ctx_trash, ctx, ctx->hdrs[i], 0, 0) == -1)
          {
            mx_close_mailbox (ctx_trash, NULL);
---- a/pager.c
-+++ b/pager.c
+Index: mutt/pager.c
+===================================================================
+--- mutt.orig/pager.c  2009-06-25 12:35:44.000000000 +0200
++++ mutt/pager.c       2009-06-25 12:36:14.000000000 +0200
 @@ -2316,12 +2316,15 @@
        MAYBE_REDRAW (redraw);
        break;
@@ -195,8 +209,10 @@ of having a trash folder feature.
        {
          if (option (OPTRESOLVE))
          {
---- a/pattern.c
-+++ b/pattern.c
+Index: mutt/pattern.c
+===================================================================
+--- mutt.orig/pattern.c        2009-06-25 12:35:37.000000000 +0200
++++ mutt/pattern.c     2009-06-25 12:36:14.000000000 +0200
 @@ -1347,8 +1347,10 @@
        {
        switch (op)

diff --git a/debian/patches/features/sensible_browser_position b/debian/patches/features/sensible_browser_position
index cf8cc7b45b0901d731aacb975fe744ac98bfae5b..744353a89f8f529f20ede902e4b6acffaddec7e4 100644 (file)
--- a/debian/patches/features/sensible_browser_position
+++ b/debian/patches/features/sensible_browser_position
@@ -5,8 +5,10 @@ This is the sensible browser position patch by Haakon Riiser.
     http://lists.df7cb.de/mutt/message/20050309.162127.a244a894.en.html
 
 == END PATCH
---- a/menu.c
-+++ b/menu.c
+Index: mutt/menu.c
+===================================================================
+--- mutt.orig/menu.c   2009-06-25 12:35:36.000000000 +0200
++++ mutt/menu.c        2009-06-25 12:36:19.000000000 +0200
 @@ -853,8 +853,17 @@
  
  int mutt_menuLoop (MUTTMENU *menu)
@@ -34,9 +36,11 @@ This is the sensible browser position patch by Haakon Riiser.
        return (i);
      }
    }
---- a/browser.c
-+++ b/browser.c
-@@ -56,6 +56,7 @@
+Index: mutt/browser.c
+===================================================================
+--- mutt.orig/browser.c        2009-06-25 12:35:37.000000000 +0200
++++ mutt/browser.c     2009-06-25 12:36:19.000000000 +0200
+@@ -55,6 +55,7 @@
    int num;
  } FOLDER;
  
@@ -44,7 +48,7 @@ This is the sensible browser position patch by Haakon Riiser.
  static char LastDir[_POSIX_PATH_MAX] = "";
  static char LastDirBackup[_POSIX_PATH_MAX] = "";
  
-@@ -526,9 +527,13 @@
+@@ -519,9 +520,13 @@
    menu->tagged = 0;
    
    if (buffy)
@@ -58,7 +62,7 @@ This is the sensible browser position patch by Haakon Riiser.
      strfcpy (path, LastDir, sizeof (path));
      mutt_pretty_mailbox (path, sizeof (path));
  #ifdef USE_IMAP
-@@ -537,8 +542,22 @@
+@@ -530,8 +535,22 @@
              path, NONULL (Mask.pattern));
    else
  #endif
@@ -83,7 +87,7 @@ This is the sensible browser position patch by Haakon Riiser.
    }
    menu->redraw = REDRAW_FULL;
  }
-@@ -721,7 +740,6 @@
+@@ -714,7 +733,6 @@
  #endif
            )
          {
@@ -91,8 +95,10 @@ This is the sensible browser position patch by Haakon Riiser.
  
            /* save the old directory */
            strfcpy (OldLastDir, LastDir, sizeof (OldLastDir));
---- a/mutt_menu.h
-+++ b/mutt_menu.h
+Index: mutt/mutt_menu.h
+===================================================================
+--- mutt.orig/mutt_menu.h      2009-06-25 12:35:44.000000000 +0200
++++ mutt/mutt_menu.h   2009-06-25 12:36:19.000000000 +0200
 @@ -49,6 +49,7 @@
    int offset; /* which screen row to start the index */
    int pagelen;        /* number of entries per screen */

diff --git a/debian/patches/features/trash-folder b/debian/patches/features/trash-folder
index 96766a8870c4f038b87ac1755552506433ace5af..b8711756f008dab38c9119f249f863242b45ccc8 100644 (file)
--- a/debian/patches/features/trash-folder
+++ b/debian/patches/features/trash-folder
@@ -46,8 +46,10 @@ To sum up, it's more integrated and transparent to the user.
   - Fixed indentation of "appended" in mutt.h.
 
 == END PATCH
---- a/commands.c
-+++ b/commands.c
+Index: mutt/commands.c
+===================================================================
+--- mutt.orig/commands.c       2009-06-25 12:35:37.000000000 +0200
++++ mutt/commands.c    2009-06-25 12:35:48.000000000 +0200
 @@ -716,6 +716,7 @@
      if (option (OPTDELETEUNTAG))
        mutt_set_flag (Context, h, M_TAG, 0);
@@ -56,8 +58,10 @@ To sum up, it's more integrated and transparent to the user.
    
    return 0;
  }
---- a/flags.c
-+++ b/flags.c
+Index: mutt/flags.c
+===================================================================
+--- mutt.orig/flags.c  2009-06-25 12:35:37.000000000 +0200
++++ mutt/flags.c       2009-06-25 12:35:48.000000000 +0200
 @@ -65,7 +65,13 @@
        {
        h->deleted = 0;
@@ -91,8 +95,10 @@ To sum up, it's more integrated and transparent to the user.
      case M_NEW:
  
        if (!mutt_bit_isset(ctx->rights,M_ACL_SEEN))
---- a/globals.h
-+++ b/globals.h
+Index: mutt/globals.h
+===================================================================
+--- mutt.orig/globals.h        2009-06-25 12:35:44.000000000 +0200
++++ mutt/globals.h     2009-06-25 12:35:48.000000000 +0200
 @@ -139,6 +139,7 @@
  WHERE char *Status;
  WHERE char *Tempdir;
@@ -101,8 +107,10 @@ To sum up, it's more integrated and transparent to the user.
  WHERE char *Username;
  WHERE char *Visual;
  WHERE char *XtermTitle;
---- a/imap/message.c
-+++ b/imap/message.c
+Index: mutt/imap/message.c
+===================================================================
+--- mutt.orig/imap/message.c   2009-06-25 12:35:37.000000000 +0200
++++ mutt/imap/message.c        2009-06-25 12:35:48.000000000 +0200
 @@ -867,6 +867,7 @@
          if (ctx->hdrs[n]->tagged)
          {
@@ -119,9 +127,11 @@ To sum up, it's more integrated and transparent to the user.
        if (option (OPTDELETEUNTAG))
          mutt_set_flag (ctx, h, M_TAG, 0);
      }
---- a/init.h
-+++ b/init.h
-@@ -3190,6 +3190,16 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:35:44.000000000 +0200
++++ mutt/init.h        2009-06-25 12:35:48.000000000 +0200
+@@ -3180,6 +3180,16 @@
    ** by \fIyou\fP.  The sixth character is used to indicate when a mail
    ** was sent to a mailing-list you subscribe to.
    */
@@ -138,8 +148,10 @@ To sum up, it's more integrated and transparent to the user.
  #ifdef USE_SOCKET
    { "tunnel",            DT_STR, R_NONE, UL &Tunnel, UL 0 },
    /*
---- a/mutt.h
-+++ b/mutt.h
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:35:44.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:35:48.000000000 +0200
 @@ -187,6 +187,7 @@
    M_DELETE,
    M_UNDELETE,
@@ -148,7 +160,7 @@ To sum up, it's more integrated and transparent to the user.
    M_FLAG,
    M_TAG,
    M_UNTAG,
-@@ -703,6 +704,7 @@
+@@ -702,6 +703,7 @@
    unsigned int mime : 1;              /* has a MIME-Version header? */
    unsigned int flagged : 1;           /* marked important? */
    unsigned int tagged : 1;
@@ -156,7 +168,7 @@ To sum up, it's more integrated and transparent to the user.
    unsigned int deleted : 1;
    unsigned int changed : 1;
    unsigned int attach_del : 1;                /* has an attachment marked for deletion */
-@@ -875,6 +877,7 @@
+@@ -874,6 +876,7 @@
    int new;                    /* how many new messages? */
    int unread;                 /* how many unread messages? */
    int deleted;                        /* how many deleted messages */
@@ -164,8 +176,10 @@ To sum up, it's more integrated and transparent to the user.
    int flagged;                        /* how many flagged messages */
    int msgnotreadyet;          /* which msg "new" in pager, -1 if none */
  
---- a/muttlib.c
-+++ b/muttlib.c
+Index: mutt/muttlib.c
+===================================================================
+--- mutt.orig/muttlib.c        2009-06-25 12:35:37.000000000 +0200
++++ mutt/muttlib.c     2009-06-25 12:35:48.000000000 +0200
 @@ -1460,7 +1460,9 @@
  
    if (magic > 0 && !mx_access (s, W_OK))
@@ -177,8 +191,10 @@ To sum up, it's more integrated and transparent to the user.
      {
        snprintf (tmp, sizeof (tmp), _("Append messages to %s?"), s);
        if ((rc = mutt_yesorno (tmp, M_YES)) == M_NO)
---- a/mx.c
-+++ b/mx.c
+Index: mutt/mx.c
+===================================================================
+--- mutt.orig/mx.c     2009-06-25 12:35:37.000000000 +0200
++++ mutt/mx.c  2009-06-25 12:35:48.000000000 +0200
 @@ -773,6 +773,53 @@
    return rc;
  }
@@ -264,13 +280,15 @@ To sum up, it's more integrated and transparent to the user.
 +  {
 +    if (trash_append (ctx) == -1)
 +      return -1;
-+  } 
++  }
 +
  #ifdef USE_IMAP
    if (ctx->magic == M_IMAP)
      rc = imap_sync_mailbox (ctx, purge, index_hint);
---- a/postpone.c
-+++ b/postpone.c
+Index: mutt/postpone.c
+===================================================================
+--- mutt.orig/postpone.c       2009-06-25 12:35:37.000000000 +0200
++++ mutt/postpone.c    2009-06-25 12:35:48.000000000 +0200
 @@ -276,6 +276,9 @@
    /* finished with this message, so delete it. */
    mutt_set_flag (PostContext, h, M_DELETE, 1);

diff --git a/debian/patches/features/xtitles b/debian/patches/features/xtitles
index 293d13fe781949017c3ea50853555386dc69b487..b42acc15a708c00814c6d358b4d72cee371870e1 100644 (file)
--- a/debian/patches/features/xtitles
+++ b/debian/patches/features/xtitles
@@ -10,8 +10,10 @@ This is the xterm title patch as found on the mutt mailing lists.
     (cleaner code, no functional change, evades conflict with sidebar patch)
 
 == END PATCH
---- a/curs_main.c
-+++ b/curs_main.c
+Index: mutt/curs_main.c
+===================================================================
+--- mutt.orig/curs_main.c      2009-06-25 12:35:37.000000000 +0200
++++ mutt/curs_main.c   2009-06-25 12:35:44.000000000 +0200
 @@ -110,6 +110,19 @@
  
  extern size_t UngetCount;
@@ -46,8 +48,10 @@ This is the xterm title patch as found on the mutt mailing lists.
        }
  
        menu->redraw = 0;
---- a/globals.h
-+++ b/globals.h
+Index: mutt/globals.h
+===================================================================
+--- mutt.orig/globals.h        2009-06-25 12:35:37.000000000 +0200
++++ mutt/globals.h     2009-06-25 12:35:44.000000000 +0200
 @@ -141,6 +141,8 @@
  WHERE char *Tochars;
  WHERE char *Username;
@@ -57,8 +61,10 @@ This is the xterm title patch as found on the mutt mailing lists.
  
  WHERE char *CurrentFolder;
  WHERE char *LastFolder;
---- a/init.c
-+++ b/init.c
+Index: mutt/init.c
+===================================================================
+--- mutt.orig/init.c   2009-06-25 12:35:42.000000000 +0200
++++ mutt/init.c        2009-06-25 12:35:44.000000000 +0200
 @@ -1892,6 +1892,26 @@
        toggle_option (MuttVars[idx].data);
        else
@@ -86,9 +92,11 @@ This is the xterm title patch as found on the mutt mailing lists.
      }
      else if (myvar || DTYPE (MuttVars[idx].type) == DT_STR ||
             DTYPE (MuttVars[idx].type) == DT_PATH ||
---- a/init.h
-+++ b/init.h
-@@ -3347,6 +3347,27 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:35:42.000000000 +0200
++++ mutt/init.h        2009-06-25 12:35:44.000000000 +0200
+@@ -3337,6 +3337,27 @@
    ** Also see the $$read_inc, $$net_inc and $$time_inc variables and the
    ** ``$tuning'' section of the manual for performance considerations.
    */
@@ -116,9 +124,11 @@ This is the xterm title patch as found on the mutt mailing lists.
    /*--*/
    { NULL, 0, 0, 0, 0 }
  };
---- a/mutt.h
-+++ b/mutt.h
-@@ -447,6 +447,7 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:35:37.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:35:44.000000000 +0200
+@@ -446,6 +446,7 @@
    OPTWRAPSEARCH,
    OPTWRITEBCC,                /* write out a bcc header? */
    OPTXMAILER,
@@ -126,8 +136,10 @@ This is the xterm title patch as found on the mutt mailing lists.
  
    OPTCRYPTUSEGPGME,
    OPTCRYPTUSEPKA,
---- a/pager.c
-+++ b/pager.c
+Index: mutt/pager.c
+===================================================================
+--- mutt.orig/pager.c  2009-06-25 12:35:37.000000000 +0200
++++ mutt/pager.c       2009-06-25 12:35:44.000000000 +0200
 @@ -1784,6 +1784,13 @@
        }
        BKGDSET (MT_COLOR_NORMAL);
@@ -142,8 +154,10 @@ This is the xterm title patch as found on the mutt mailing lists.
      }
  
      if ((redraw & REDRAW_INDEX) && index)
---- a/status.c
-+++ b/status.c
+Index: mutt/status.c
+===================================================================
+--- mutt.orig/status.c 2009-06-25 12:35:37.000000000 +0200
++++ mutt/status.c      2009-06-25 12:35:44.000000000 +0200
 @@ -195,6 +195,8 @@
        break;
  
@@ -153,8 +167,10 @@ This is the xterm title patch as found on the mutt mailing lists.
        if (menu->top + menu->pagelen >= menu->max)
        cp = menu->top ? "end" : "all";
        else
---- a/mutt_menu.h
-+++ b/mutt_menu.h
+Index: mutt/mutt_menu.h
+===================================================================
+--- mutt.orig/mutt_menu.h      2009-06-25 12:35:37.000000000 +0200
++++ mutt/mutt_menu.h   2009-06-25 12:35:44.000000000 +0200
 @@ -103,6 +103,8 @@
  void menu_current_bottom (MUTTMENU *);
  void menu_check_recenter (MUTTMENU *);

diff --git a/debian/patches/misc/smime_keys-manpage.patch b/debian/patches/misc/smime_keys-manpage.patch
index ebe24f1437ae7a66e10ba510c7c3338a3c0a915c..e159d44368e2ae9b8a29f72fd9920b5f49a7354d 100644 (file)
--- a/debian/patches/misc/smime_keys-manpage.patch
+++ b/debian/patches/misc/smime_keys-manpage.patch
@@ -1,8 +1,10 @@
 add a missing manpage for smime_keys
 see upstream CR #3272
 
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
+Index: mutt/doc/Makefile.am
+===================================================================
+--- mutt.orig/doc/Makefile.am  2009-06-25 12:35:40.000000000 +0200
++++ mutt/doc/Makefile.am       2009-06-25 12:36:48.000000000 +0200
 @@ -10,6 +10,7 @@
  noinst_PROGRAMS = makedoc
  
@@ -36,7 +38,7 @@ see upstream CR #3272
                rm -f $(DESTDIR)$(mandir)/man1/$$f ; \
        done
        for f in muttrc.5 mbox.5 mmdf.5 ; do \
-@@ -145,7 +147,7 @@
+@@ -142,7 +144,7 @@
        rm -rf vars.tmp.1 vars.tmp.2
  
  clean-local:
@@ -45,7 +47,7 @@ see upstream CR #3272
        rm -f *.aux *.log *.tex *.out
  
  DISTCLEANFILES=manual.txt manual.html manual.xml manual.pdf html \
-@@ -169,6 +171,9 @@
+@@ -166,6 +168,9 @@
  mutt.1: $(srcdir)/mutt.man
        $(EDIT) $(srcdir)/mutt.man > $@
  
@@ -55,8 +57,10 @@ see upstream CR #3272
  stamp-doc-xml: makedoc$(EXEEXT) $(top_srcdir)/init.h \
                 manual.xml.head $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
                 $(srcdir)/gen-map-doc $(top_srcdir)/VERSION $(top_srcdir)/ChangeLog
---- /dev/null
-+++ b/doc/smime_keys.man
+Index: mutt/doc/smime_keys.man
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ mutt/doc/smime_keys.man    2009-06-25 12:36:48.000000000 +0200
 @@ -0,0 +1,69 @@
 +.\" -*-nroff-*-
 +.\"

diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index c719c2c5f9372cb2d2fe24a85fb2069e0723ce1b..b34a73e0cd5e7d5be0b50383c1cb8f2b05d591c5 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -29,9 +29,11 @@ in the "mutt-patched" package.
   - 2008-08-02 myon: Refreshed patch using quilt push -f to remove hunks we do
     not need (Makefile.in).
 
---- a/buffy.c
-+++ b/buffy.c
-@@ -292,6 +292,7 @@
+Index: mutt/buffy.c
+===================================================================
+--- mutt.orig/buffy.c  2009-06-25 12:36:44.000000000 +0200
++++ mutt/buffy.c       2009-06-25 12:36:53.000000000 +0200
+@@ -289,6 +289,7 @@
    char path[_POSIX_PATH_MAX];
    struct stat contex_sb;
    time_t t;
@@ -39,7 +41,7 @@ in the "mutt-patched" package.
  
    sb.st_size=0;
    contex_sb.st_dev=0;
-@@ -331,6 +332,8 @@
+@@ -328,6 +329,8 @@
    
    for (tmp = Incoming; tmp; tmp = tmp->next)
    {
@@ -48,7 +50,7 @@ in the "mutt-patched" package.
  #ifdef USE_IMAP
      if (tmp->magic != M_IMAP)
  #endif
-@@ -388,10 +391,27 @@
+@@ -384,10 +387,27 @@
        case M_MBOX:
        case M_MMDF:
  
@@ -79,7 +81,7 @@ in the "mutt-patched" package.
        }
        else if (option(OPTCHECKMBOXSIZE))
        {
-@@ -401,35 +421,86 @@
+@@ -397,35 +417,86 @@
        if (tmp->newly_created &&
            (sb.st_ctime != sb.st_mtime || sb.st_ctime != sb.st_atime))
          tmp->newly_created = 0;
@@ -171,8 +173,10 @@ in the "mutt-patched" package.
        break;
        }
      }
---- a/buffy.h
-+++ b/buffy.h
+Index: mutt/buffy.h
+===================================================================
+--- mutt.orig/buffy.h  2009-06-24 19:37:58.000000000 +0200
++++ mutt/buffy.h       2009-06-25 12:36:53.000000000 +0200
 @@ -25,7 +25,12 @@
    char path[_POSIX_PATH_MAX];
    off_t size;
@@ -186,8 +190,10 @@ in the "mutt-patched" package.
    short notified;             /* user has been notified */
    short magic;                        /* mailbox type */
    short newly_created;                /* mbox or mmdf just popped into existence */
---- a/color.c
-+++ b/color.c
+Index: mutt/color.c
+===================================================================
+--- mutt.orig/color.c  2009-06-24 19:37:58.000000000 +0200
++++ mutt/color.c       2009-06-25 12:36:53.000000000 +0200
 @@ -93,6 +93,8 @@
    { "bold",           MT_COLOR_BOLD },
    { "underline",      MT_COLOR_UNDERLINE },
@@ -197,8 +203,10 @@ in the "mutt-patched" package.
    { NULL,             0 }
  };
  
---- a/compose.c
-+++ b/compose.c
+Index: mutt/compose.c
+===================================================================
+--- mutt.orig/compose.c        2009-06-24 19:37:58.000000000 +0200
++++ mutt/compose.c     2009-06-25 12:36:53.000000000 +0200
 @@ -72,7 +72,7 @@
  
  #define HDR_XOFFSET 10
@@ -324,8 +332,10 @@ in the "mutt-patched" package.
          mutt_paddstr (W, fcc);
          fccSet = 1;
        }
---- a/curs_main.c
-+++ b/curs_main.c
+Index: mutt/curs_main.c
+===================================================================
+--- mutt.orig/curs_main.c      2009-06-25 12:36:26.000000000 +0200
++++ mutt/curs_main.c   2009-06-25 12:36:53.000000000 +0200
 @@ -26,7 +26,9 @@
  #include "mailbox.h"
  #include "mapping.h"
@@ -424,8 +434,10 @@ in the "mutt-patched" package.
        default:
        if (menu->menu == MENU_MAIN)
          km_error_key (MENU_MAIN);
---- a/flags.c
-+++ b/flags.c
+Index: mutt/flags.c
+===================================================================
+--- mutt.orig/flags.c  2009-06-25 12:36:14.000000000 +0200
++++ mutt/flags.c       2009-06-25 12:36:53.000000000 +0200
 @@ -22,8 +22,10 @@
  
  #include "mutt.h"
@@ -445,8 +457,10 @@ in the "mutt-patched" package.
  }
  
  void mutt_tag_set_flag (int flag, int bf)
---- a/functions.h
-+++ b/functions.h
+Index: mutt/functions.h
+===================================================================
+--- mutt.orig/functions.h      2009-06-25 12:36:35.000000000 +0200
++++ mutt/functions.h   2009-06-25 12:36:53.000000000 +0200
 @@ -169,6 +169,11 @@
    { "decrypt-save",           OP_DECRYPT_SAVE,                NULL },
  
@@ -471,8 +485,10 @@ in the "mutt-patched" package.
    { NULL,             0,                              NULL }
  };
  
---- a/globals.h
-+++ b/globals.h
+Index: mutt/globals.h
+===================================================================
+--- mutt.orig/globals.h        2009-06-25 12:36:22.000000000 +0200
++++ mutt/globals.h     2009-06-25 12:36:53.000000000 +0200
 @@ -117,6 +117,7 @@
  WHERE char *SendCharset;
  WHERE char *Sendmail;
@@ -491,9 +507,11 @@ in the "mutt-patched" package.
  #ifdef USE_IMAP
  WHERE short ImapKeepalive;
  WHERE short ImapPipelineDepth;
---- a/init.h
-+++ b/init.h
-@@ -1963,6 +1963,22 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:40.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:53.000000000 +0200
+@@ -1953,6 +1953,22 @@
    ** not used.
    ** (PGP only)
    */
@@ -516,8 +534,10 @@ in the "mutt-patched" package.
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp
---- a/mailbox.h
-+++ b/mailbox.h
+Index: mutt/mailbox.h
+===================================================================
+--- mutt.orig/mailbox.h        2009-06-24 19:37:58.000000000 +0200
++++ mutt/mailbox.h     2009-06-25 12:36:53.000000000 +0200
 @@ -27,6 +27,7 @@
  #define M_NEWFOLDER   (1<<4) /* create a new folder - same as M_APPEND, but uses
                                * safe_fopen() for mbox-style folders.
@@ -526,8 +546,10 @@ in the "mutt-patched" package.
  
  /* mx_open_new_message() */
  #define M_ADD_FROM    1       /* add a From_ line */
---- a/Makefile.am
-+++ b/Makefile.am
+Index: mutt/Makefile.am
+===================================================================
+--- mutt.orig/Makefile.am      2009-06-25 12:36:26.000000000 +0200
++++ mutt/Makefile.am   2009-06-25 12:36:53.000000000 +0200
 @@ -29,7 +29,8 @@
        score.c send.c sendlib.c signal.c sort.c \
        status.c system.c thread.c charset.c history.c lib.c \
@@ -538,8 +560,10 @@ in the "mutt-patched" package.
  
  nodist_mutt_SOURCES = $(BUILT_SOURCES)
  
---- a/mbox.c
-+++ b/mbox.c
+Index: mutt/mbox.c
+===================================================================
+--- mutt.orig/mbox.c   2009-06-25 12:36:45.000000000 +0200
++++ mutt/mbox.c        2009-06-25 12:36:53.000000000 +0200
 @@ -104,6 +104,7 @@
      mutt_perror (ctx->path);
      return (-1);
@@ -556,8 +580,10 @@ in the "mutt-patched" package.
  
  #ifdef NFS_ATTRIBUTE_HACK
    if (sb.st_mtime > sb.st_atime)
---- a/menu.c
-+++ b/menu.c
+Index: mutt/menu.c
+===================================================================
+--- mutt.orig/menu.c   2009-06-25 12:36:19.000000000 +0200
++++ mutt/menu.c        2009-06-25 12:36:53.000000000 +0200
 @@ -24,6 +24,7 @@
  #include "mutt_curses.h"
  #include "mutt_menu.h"
@@ -661,8 +687,10 @@ in the "mutt-patched" package.
      else if (option (OPTBRAILLEFRIENDLY))
        move (menu->current - menu->top + menu->offset, 0);
      else
---- a/mutt_curses.h
-+++ b/mutt_curses.h
+Index: mutt/mutt_curses.h
+===================================================================
+--- mutt.orig/mutt_curses.h    2009-06-24 19:37:58.000000000 +0200
++++ mutt/mutt_curses.h 2009-06-25 12:36:53.000000000 +0200
 @@ -64,6 +64,7 @@
  #undef lines
  #endif /* lines */
@@ -680,9 +708,11 @@ in the "mutt-patched" package.
    MT_COLOR_MAX
  };
  
---- a/mutt.h
-+++ b/mutt.h
-@@ -426,6 +426,7 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:36:26.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:36:53.000000000 +0200
+@@ -425,6 +425,7 @@
    OPTSAVEEMPTY,
    OPTSAVENAME,
    OPTSCORE,
@@ -690,7 +720,7 @@ in the "mutt-patched" package.
    OPTSIGDASHES,
    OPTSIGONTOP,
    OPTSORTRE,
-@@ -865,6 +866,7 @@
+@@ -864,6 +865,7 @@
  {
    char *path;
    FILE *fp;
@@ -698,7 +728,7 @@ in the "mutt-patched" package.
    time_t mtime;
    off_t size;
    off_t vsize;
-@@ -905,6 +907,7 @@
+@@ -904,6 +906,7 @@
    unsigned int quiet : 1;     /* inhibit status messages? */
    unsigned int collapsed : 1;   /* are all threads collapsed? */
    unsigned int closing : 1;   /* mailbox is being closed */
@@ -706,8 +736,10 @@ in the "mutt-patched" package.
  
    /* driver hooks */
    void *data;                 /* driver specific data */
---- a/muttlib.c
-+++ b/muttlib.c
+Index: mutt/muttlib.c
+===================================================================
+--- mutt.orig/muttlib.c        2009-06-25 12:35:48.000000000 +0200
++++ mutt/muttlib.c     2009-06-25 12:36:53.000000000 +0200
 @@ -1232,6 +1232,8 @@
          pl = pw = 1;
  
@@ -770,8 +802,10 @@ in the "mutt-patched" package.
        break; /* skip rest of input */
        }
        else if (ch == '|')
---- a/mx.c
-+++ b/mx.c
+Index: mutt/mx.c
+===================================================================
+--- mutt.orig/mx.c     2009-06-25 12:36:45.000000000 +0200
++++ mutt/mx.c  2009-06-25 12:36:53.000000000 +0200
 @@ -595,6 +595,7 @@
   *            M_APPEND        open mailbox for appending
   *            M_READONLY      open mailbox in read-only mode
@@ -811,8 +845,10 @@ in the "mutt-patched" package.
  
    if (ctx->mx_close)
      ctx->mx_close (ctx);
---- a/OPS
-+++ b/OPS
+Index: mutt/OPS
+===================================================================
+--- mutt.orig/OPS      2009-06-25 12:36:14.000000000 +0200
++++ mutt/OPS   2009-06-25 12:36:53.000000000 +0200
 @@ -179,3 +179,8 @@
  OP_MAIN_SHOW_LIMIT "show currently active limit pattern"
  OP_MAIN_COLLAPSE_THREAD "collapse/uncollapse current thread"
@@ -822,8 +858,10 @@ in the "mutt-patched" package.
 +OP_SIDEBAR_NEXT "go down to next mailbox"
 +OP_SIDEBAR_PREV "go to previous mailbox"
 +OP_SIDEBAR_OPEN "open hilighted mailbox"
---- a/pager.c
-+++ b/pager.c
+Index: mutt/pager.c
+===================================================================
+--- mutt.orig/pager.c  2009-06-25 12:36:14.000000000 +0200
++++ mutt/pager.c       2009-06-25 12:36:53.000000000 +0200
 @@ -29,6 +29,7 @@
  #include "pager.h"
  #include "attach.h"
@@ -929,8 +967,10 @@ in the "mutt-patched" package.
        default:
        ch = -1;
        break;
---- /dev/null
-+++ b/sidebar.c
+Index: mutt/sidebar.c
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ mutt/sidebar.c     2009-06-25 12:36:53.000000000 +0200
 @@ -0,0 +1,333 @@
 +/*
 + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
@@ -1265,8 +1305,10 @@ in the "mutt-patched" package.
 +      draw_sidebar(menu);
 +}
 +
---- /dev/null
-+++ b/sidebar.h
+Index: mutt/sidebar.h
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ mutt/sidebar.h     2009-06-25 12:36:53.000000000 +0200
 @@ -0,0 +1,36 @@
 +/*
 + * Copyright (C) ????-2004 Justin Hibbits <jrh29@po.cwru.edu>
@@ -1304,8 +1346,10 @@ in the "mutt-patched" package.
 +void set_buffystats(CONTEXT*);
 +
 +#endif /* SIDEBAR_H */
---- a/doc/Muttrc
-+++ b/doc/Muttrc
+Index: mutt/doc/Muttrc
+===================================================================
+--- mutt.orig/doc/Muttrc       2009-06-24 19:37:58.000000000 +0200
++++ mutt/doc/Muttrc    2009-06-25 12:36:53.000000000 +0200
 @@ -657,6 +657,26 @@
  # $crypt_autosign, $crypt_replysign and $smime_is_default.
  # 
@@ -1333,8 +1377,10 @@ in the "mutt-patched" package.
  # set crypt_autosign=no
  #
  # Name: crypt_autosign
---- a/imap/imap.c
-+++ b/imap/imap.c
+Index: mutt/imap/imap.c
+===================================================================
+--- mutt.orig/imap/imap.c      2009-06-24 19:37:58.000000000 +0200
++++ mutt/imap/imap.c   2009-06-25 12:36:53.000000000 +0200
 @@ -1521,7 +1521,7 @@
  
      imap_munge_mbox_name (munged, sizeof (munged), name);
@@ -1344,8 +1390,10 @@ in the "mutt-patched" package.
  
      if (imap_exec (idata, command, IMAP_CMD_QUEUE) < 0)
      {
---- a/imap/command.c
-+++ b/imap/command.c
+Index: mutt/imap/command.c
+===================================================================
+--- mutt.orig/imap/command.c   2009-06-24 19:37:58.000000000 +0200
++++ mutt/imap/command.c        2009-06-25 12:36:53.000000000 +0200
 @@ -1009,6 +1009,13 @@
             opened */
          status->uidnext = oldun;

diff --git a/debian/patches/mutt-patched/sidebar-dotted b/debian/patches/mutt-patched/sidebar-dotted
index b5e3bc0804f8949bed41012c29b56016188881e7..2c07d0b8ee5e8aca22346c2756f4dd80b7e10dc0 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-dotted
+++ b/debian/patches/mutt-patched/sidebar-dotted
@@ -9,8 +9,10 @@ This patch enables mutt to find these dots and
 
 I hope, it's usefull for someone ;)
 
---- a/sidebar.c
-+++ b/sidebar.c
+Index: mutt/sidebar.c
+===================================================================
+--- mutt.orig/sidebar.c        2009-06-25 12:36:53.000000000 +0200
++++ mutt/sidebar.c     2009-06-25 12:36:59.000000000 +0200
 @@ -255,14 +255,23 @@
                        int i;
                        tmp_folder_name = tmp->path + strlen(Maildir);
@@ -38,9 +40,11 @@ I hope, it's usefull for someone ;)
                        }
                }
                printw( "%.*s", SidebarWidth - delim_len + 1,
---- a/init.h
-+++ b/init.h
-@@ -1979,6 +1979,11 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:53.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:59.000000000 +0200
+@@ -1969,6 +1969,11 @@
    ** .pp
    ** The width of the sidebar.
    */
@@ -52,9 +56,11 @@ I hope, it's usefull for someone ;)
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp
---- a/mutt.h
-+++ b/mutt.h
-@@ -427,6 +427,7 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:36:53.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:36:59.000000000 +0200
+@@ -426,6 +426,7 @@
    OPTSAVENAME,
    OPTSCORE,
    OPTSIDEBAR,

diff --git a/debian/patches/mutt-patched/sidebar-sorted b/debian/patches/mutt-patched/sidebar-sorted
index dbfa3cf6baeadfbe9cdfeaa7b6b0cc9d0fa9f1da..5467465134485fbf4959528745d498c1e32c4b39 100644 (file)
--- a/debian/patches/mutt-patched/sidebar-sorted
+++ b/debian/patches/mutt-patched/sidebar-sorted
@@ -11,8 +11,10 @@ I hope, it's usefull for someone ;)
 PS: This has to be applied ontop of my sidebar-dotted patch, but it
 should be easy to adopt it to a vanilla mutt.
 
---- a/sidebar.c
-+++ b/sidebar.c
+Index: mutt/sidebar.c
+===================================================================
+--- mutt.orig/sidebar.c        2009-06-25 12:36:59.000000000 +0200
++++ mutt/sidebar.c     2009-06-25 12:37:03.000000000 +0200
 @@ -54,6 +54,35 @@
        for ( ; tmp->next != 0; tmp = tmp->next )
                tmp->next->prev = tmp;
@@ -49,9 +51,11 @@ should be easy to adopt it to a vanilla mutt.
        if ( TopBuffy == 0 && BottomBuffy == 0 )
                TopBuffy = Incoming;
        if ( BottomBuffy == 0 ) {
---- a/init.h
-+++ b/init.h
-@@ -1984,6 +1984,11 @@
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:36:59.000000000 +0200
++++ mutt/init.h        2009-06-25 12:37:03.000000000 +0200
+@@ -1974,6 +1974,11 @@
    ** .pp
    ** Should the sidebar shorten the path showed.
    */
@@ -63,9 +67,11 @@ should be easy to adopt it to a vanilla mutt.
    { "pgp_use_gpg_agent", DT_BOOL, R_NONE, OPTUSEGPGAGENT, 0},
    /*
    ** .pp
---- a/mutt.h
-+++ b/mutt.h
-@@ -428,6 +428,7 @@
+Index: mutt/mutt.h
+===================================================================
+--- mutt.orig/mutt.h   2009-06-25 12:36:59.000000000 +0200
++++ mutt/mutt.h        2009-06-25 12:37:03.000000000 +0200
+@@ -427,6 +427,7 @@
    OPTSCORE,
    OPTSIDEBAR,
    OPTSIDEBARSHORTPATH,

diff --git a/debian/patches/series b/debian/patches/series
index 0dc2ae4711a63674bde94b33a2375ce9cc1cffed..9eaf09655a2988c70c79018b13e2d5e23e3aca25 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -35,6 +35,7 @@ upstream/531430-imapuser.patch
 
 # the following two patches are also in upstream hg repo
 # plese drop them if there is a new release
+534543-imap-port.patch
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch
 misc/smime_keys-manpage.patch