From: Christoph Berg <myon@debian.org>
Date: Thu, 15 Mar 2007 13:11:31 +0000 (+0100)
Subject: mutt (1.5.14+cvs20070315-1) experimental; urgency=low
X-Git-Tag: 1.5.14+cvs20070315-1
X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/2fc779d212449aded8db453cd8821255913412b5?ds=inline;hp=--cc

mutt (1.5.14+cvs20070315-1) experimental; urgency=low

  * New upstream snapshot (now from mercurial).
    + send_charset supports charset-hook'd charsets (Closes: #152444).
    + Regex for color patterns can be > 256 chars long (Closes: #229801).
    + Reduces massive strcat use (Closes: #290701).
    + Uses realpath of folders in the cache (Closes: #298121).
    + Wraps help correctly on utf-8 terminals (Closes: #328921).
    + Fixes typos in muttrc.5 (Closes: #366413).
    + Requery IMAP capabilities after login (Closes: #384076).
    + Various mutt.1 updates (Closes: #332803, #355912, #366413, #394256).
    + The key binding documentation is now auto-generated, thereby documenting
      some missing functions (Closes: #413144).
    + Previously fixed: IMAP hangs (Closes: #413715).
  * Split up Muttrc into separate files in /etc/Muttrc.d/.
  * charset.rc: iconv-hooks for some commonly misused charsets
    (Closes: #402027).
  * Add compatibility alias file_charset for attach_charset (got renamed when
    the assumed-charset patch went upstream).
  * Patches:
    + compressed-folders: synced with upstream.
    + compressed-folders.ranty-fix: removed, went upstream.
  * Packaging:
    + Use quilt.make.
    + Move patchlist sorting into patchlist.sh.
---

2fc779d212449aded8db453cd8821255913412b5
diff --git a/debian/changelog b/debian/changelog
index bd125a7..b9d4f4d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+mutt (1.5.14+cvs20070315-1) experimental; urgency=low
+
+  * New upstream snapshot (now from mercurial).
+    + send_charset supports charset-hook'd charsets (Closes: #152444).
+    + Regex for color patterns can be > 256 chars long (Closes: #229801).
+    + Reduces massive strcat use (Closes: #290701).
+    + Uses realpath of folders in the cache (Closes: #298121).
+    + Wraps help correctly on utf-8 terminals (Closes: #328921).
+    + Fixes typos in muttrc.5 (Closes: #366413).
+    + Requery IMAP capabilities after login (Closes: #384076).
+    + Various mutt.1 updates (Closes: #332803, #355912, #366413, #394256).
+    + The key binding documentation is now auto-generated, thereby documenting
+      some missing functions (Closes: #413144).
+    + Previously fixed: IMAP hangs (Closes: #413715).
+  * Split up Muttrc into separate files in /etc/Muttrc.d/.
+  * charset.rc: iconv-hooks for some commonly misused charsets
+    (Closes: #402027).
+  * Add compatibility alias file_charset for attach_charset (got renamed when
+    the assumed-charset patch went upstream).
+  * Patches:
+    + compressed-folders: synced with upstream.
+    + compressed-folders.ranty-fix: removed, went upstream.
+  * Packaging:
+    + Use quilt.make.
+    + Move patchlist sorting into patchlist.sh.
+
+ -- Christoph Berg <myon@debian.org>  Thu, 15 Mar 2007 14:11:31 +0100
+
 mutt (1.5.14+cvs20070301-1) experimental; urgency=low
 
   * New upstream snapshot. Hilights:
diff --git a/debian/control b/debian/control
index eafe7d1..1ab0bca 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: mail
 Priority: standard
 Maintainer: Adeodato Simó <dato@net.com.org.es>
 Uploaders: Christoph Berg <myon@debian.org>
-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, libgpgme11-dev
+Build-Depends: debhelper, quilt (>= 0.40-1), 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, libgpgme11-dev
 Standards-Version: 3.7.2
 
 Package: mutt
diff --git a/debian/copyright b/debian/copyright
index 407aaa1..65b55d5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,9 +41,11 @@ Contributors:
     Copyright (C) 1999-2001 Tommi Komulainen <Tommi.Komulainen@iki.fi>
     Copyright (C) 2001-2004 Andrew McDonald
     Copyright (C) 2001 Mike Schiraldi
-    Copyright (C) 2006 Rocco Rutte
+    Copyright (C) 2005-2007 Rocco Rutte
     Copyright (C) 2000-2003 Vsevolod Volkov
     Copyright (C) 2004 Tobias Werth
+    Copyright (C) 2005 Andreas Krennmair <ak@synflood.at>
+    Copyright (C) 2005 Peter J. Holzer <hjp@hjp.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/debian/extra/rc/source-Muttrc.d.rc b/debian/extra/rc/Muttrc.foot
similarity index 100%
rename from debian/extra/rc/source-Muttrc.d.rc
rename to debian/extra/rc/Muttrc.foot
diff --git a/debian/extra/rc/charset.rc b/debian/extra/rc/charset.rc
new file mode 100644
index 0000000..ebbeb3e
--- /dev/null
+++ b/debian/extra/rc/charset.rc
@@ -0,0 +1,9 @@
+# Some GB18030 traditional Chinese mails are wrongly labelled GB2312.
+# The first charset is a superset of the second. Let's alias it, so
+# that Mutt displays such mails as if they were correctly labelled.
+charset-hook ^gb2312$ gb18030
+
+# Some mailers send EUC-JP-MS Japanese mails wrongly labelled EUC-JP.
+# The first charset is a superset of the second. Let's also alias it.
+charset-hook ^euc-jp$ euc-jp-ms
+
diff --git a/debian/mutt.install b/debian/mutt.install
index 55e247f..ad84104 100644
--- a/debian/mutt.install
+++ b/debian/mutt.install
@@ -10,5 +10,7 @@ debian/extra/lib/source-muttrc.d	usr/lib/mutt
 debian/extra/lib/debian-ldap-query	usr/lib/mutt
 
 debian/tmp/Muttrc			etc
+debian/tmp/gpg.rc			etc/Muttrc.d
+debian/extra/rc/*.rc			etc/Muttrc.d
 debian/extra/mutt.xpm			usr/share/pixmaps
 debian/tmp/usr/share/doc/*.html		usr/share/doc/mutt/html
diff --git a/debian/patches/debian-specific/Md.Muttrc.diff b/debian/patches/debian-specific/Muttrc
similarity index 77%
rename from debian/patches/debian-specific/Md.Muttrc.diff
rename to debian/patches/debian-specific/Muttrc
index 37cee64..72906b3 100644
--- a/debian/patches/debian-specific/Md.Muttrc.diff
+++ b/debian/patches/debian-specific/Muttrc
@@ -1,7 +1,7 @@
-Index: Muttrc.head.in
+Index: trunk/Muttrc.head
 ===================================================================
---- Muttrc.head.in.orig	2007-03-01 23:38:41.396146688 +0100
-+++ Muttrc.head.in	2007-03-02 00:19:31.107733920 +0100
+--- trunk.orig/Muttrc.head	2007-03-15 16:33:18.000000000 +0100
++++ trunk/Muttrc.head	2007-03-15 16:35:15.000000000 +0100
 @@ -6,6 +6,33 @@
  #
  ignore "from " received content- mime-version status x-status message-id
@@ -36,14 +36,12 @@ Index: Muttrc.head.in
  
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
-@@ -15,14 +42,16 @@ macro index,pager \cb "<pipe-message> ur
+@@ -15,14 +42,14 @@ macro index,pager \cb "<pipe-message> ur
  macro attach,compose \cb "<pipe-entry> urlview<Enter>" "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
 -macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
-+macro generic <f1> "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation"
-+macro index   <f1> "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation"
-+macro pager   <f1> "!zcat @docdir@/mutt/manual.txt.gz | sensible-pager\n" "Show Mutt documentation"
++macro generic,pager <f1> "<shell-escape> zcat @docdir@/mutt/manual.txt.gz | sensible-pager<enter>" "show Mutt documentation"
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
@@ -55,13 +53,13 @@ Index: Muttrc.head.in
  #
  # set hostname=cs.hmc.edu
  
-@@ -84,7 +113,6 @@ attachments   +I text/plain
+@@ -84,6 +111,9 @@ attachments   +I text/plain
  attachments   -A message/external-body
  attachments   -I message/external-body
  
--##
--## More settings
--##
 +# enable mime lookup by extension
 +mime_lookup application/octet-stream
- 
++
+ ##
+ ## More settings
+ ##
diff --git a/debian/patches/debian-specific/assumed_charset-compat b/debian/patches/debian-specific/assumed_charset-compat
new file mode 100644
index 0000000..3a6c763
--- /dev/null
+++ b/debian/patches/debian-specific/assumed_charset-compat
@@ -0,0 +1,17 @@
+On upstream inclusion of the assumed_charset patch (past 1.5.14), file_charset
+got renamed to attach_charset. We add it back for compatibility.
+
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h	2007-03-12 19:11:53.000000000 +0100
++++ mutt/init.h	2007-03-12 19:13:56.000000000 +0100
+@@ -248,6 +248,9 @@ struct option_t MuttVars[] = {
+   ** Note: "iso-2022-*" must be put at the head of the value as shown above
+   ** if included.
+   */
++  { "file_charset",	DT_SYN,  R_NONE, UL "attach_charset", 0 },
++  /*
++  */
+   { "attach_format",	DT_STR,  R_NONE, UL &AttachFormat, UL "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] " },
+   /*
+   ** .pp
diff --git a/debian/patches/debian-specific/sort-patchlist b/debian/patches/debian-specific/sort-patchlist
new file mode 100644
index 0000000..a2fd47f
--- /dev/null
+++ b/debian/patches/debian-specific/sort-patchlist
@@ -0,0 +1,12 @@
+Index: trunk/patchlist.sh
+===================================================================
+--- trunk.orig/patchlist.sh	2007-03-15 15:50:14.000000000 +0100
++++ trunk/patchlist.sh	2007-03-15 15:50:41.000000000 +0100
+@@ -15,6 +15,6 @@ EOF
+ 
+ while read patch ; do
+ 	echo "  puts (\"${patch}\");"
+-done
++done | LC_COLLATE=C sort
+ 
+ echo "}"
diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index 7c0268c..288ab6f 100644
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -7,23 +7,21 @@ The home page for this patch is:
   http://www.spinnaker.de/mutt/compressed/
 
 * Patch last synced with upstream:
-  - Date: 2005-09-29
-  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.11.rr.compressed.1.gz
+  - Date: 2007-03-13
+  - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.14.rr.compressed.1.gz
 
 * Changes made:
   - filterdiff -p1 \
     $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \
       doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done)
-  - adjust the init.h hunk to the presence of group & ungroup
-  - 2006-07-15: adjust Makefile.am and doc/manual.xml.head to mutt-1.5.12
-  - 2006-08-16: adjust Makefile.am mutt-1.5.13
+  - 2007-03-13 myon: update for 1.5.14+tip (conflict in hook.c)
 
 == END PATCH
-Index: compress.c
+Index: mutt/compress.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ compress.c	2007-03-01 22:30:00.101678680 +0100
-@@ -0,0 +1,487 @@
++++ mutt/compress.c	2007-03-13 20:59:30.000000000 +0100
+@@ -0,0 +1,499 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
 + *
@@ -130,7 +128,19 @@ Index: compress.c
 +  int magic;
 +
 +  if (is_new (path))
-+    return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0);
++  {
++    char *dir_path = safe_strdup(path);
++    char *aux = strrchr(dir_path, '/');
++    int dir_valid = 1;
++    if (aux)
++    {
++      *aux='\0';
++      if (access(dir_path, W_OK|X_OK))
++        dir_valid = 0;
++    }
++    safe_free((void**)&dir_path);
++    return dir_valid && (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0);
++  }
 +
 +  magic = mx_get_magic (path);
 +
@@ -511,10 +521,10 @@ Index: compress.c
 +}
 +
 +#endif /* USE_COMPRESSED */
-Index: compress.h
+Index: mutt/compress.h
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ compress.h	2007-03-01 22:30:00.101678680 +0100
++++ mutt/compress.h	2007-03-13 20:59:30.000000000 +0100
 @@ -0,0 +1,27 @@
 +/*
 + * Copyright (C) 1997 Alain Penders <Alain@Finale-Dev.com>
@@ -543,11 +553,11 @@ Index: compress.h
 +int mutt_test_compress_command (const char *);
 +int mutt_check_mailbox_compressed (CONTEXT *);
 +void mutt_fast_close_compressed (CONTEXT *);
-Index: configure.in
+Index: mutt/configure.in
 ===================================================================
---- configure.in.orig	2007-03-01 22:20:42.248485256 +0100
-+++ configure.in	2007-03-01 22:30:00.102678528 +0100
-@@ -808,6 +808,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
+--- mutt.orig/configure.in	2007-03-13 20:53:07.000000000 +0100
++++ mutt/configure.in	2007-03-13 20:59:30.000000000 +0100
+@@ -807,6 +807,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN
                  AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ])
          fi])
  
@@ -559,10 +569,10 @@ Index: configure.in
  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",
-Index: curs_main.c
+Index: mutt/curs_main.c
 ===================================================================
---- curs_main.c.orig	2007-03-01 22:08:47.806097008 +0100
-+++ curs_main.c	2007-03-01 22:30:00.102678528 +0100
+--- mutt.orig/curs_main.c	2007-03-13 20:53:07.000000000 +0100
++++ mutt/curs_main.c	2007-03-13 20:59:30.000000000 +0100
 @@ -1090,6 +1090,11 @@ int mutt_index_menu (void)
          {
  	  int check;
@@ -575,13 +585,13 @@ Index: curs_main.c
  	  mutt_str_replace (&LastFolder, Context->path);
  	  oldcount = Context ? Context->msgcount : 0;
  
-Index: doc/manual.xml.head
+Index: mutt/doc/manual.xml.head
 ===================================================================
---- doc/manual.xml.head.orig	2007-03-01 22:08:47.852090016 +0100
-+++ doc/manual.xml.head	2007-03-01 22:30:00.106677920 +0100
-@@ -4749,6 +4749,205 @@ becomes an issue as mutt will silently f
+--- mutt.orig/doc/manual.xml.head	2007-03-13 20:53:07.000000000 +0100
++++ mutt/doc/manual.xml.head	2007-03-13 20:59:30.000000000 +0100
+@@ -4843,6 +4843,205 @@ becomes an issue as mutt will silently f
  
- </sect1>
+ </chapter>
  
 +<sect1 id="compressedfolders">
 +<title>Compressed folders Support (OPTIONAL)</title>
@@ -782,13 +792,13 @@ Index: doc/manual.xml.head
 +</sect2>
 +</sect1>
 +
- </chapter>
- 
  <chapter id="mimesupport">
-Index: doc/muttrc.man.head
+ <title>Mutt's MIME Support</title>
+ 
+Index: mutt/doc/muttrc.man.head
 ===================================================================
---- doc/muttrc.man.head.orig	2007-03-01 22:08:47.900082720 +0100
-+++ doc/muttrc.man.head	2007-03-01 22:30:00.106677920 +0100
+--- mutt.orig/doc/muttrc.man.head	2007-03-13 20:53:07.000000000 +0100
++++ mutt/doc/muttrc.man.head	2007-03-13 20:59:30.000000000 +0100
 @@ -316,6 +316,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,
@@ -814,10 +824,10 @@ Index: doc/muttrc.man.head
  .TP
  \fBpush\fP \fIstring\fP
  This command adds the named \fIstring\fP to the keyboard buffer.
-Index: hook.c
+Index: mutt/hook.c
 ===================================================================
---- hook.c.orig	2007-03-01 22:08:47.947075576 +0100
-+++ hook.c	2007-03-01 22:30:00.107677768 +0100
+--- mutt.orig/hook.c	2007-03-13 20:53:07.000000000 +0100
++++ mutt/hook.c	2007-03-13 21:00:40.000000000 +0100
 @@ -24,6 +24,10 @@
  #include "mailbox.h"
  #include "mutt_crypt.h"
@@ -843,29 +853,29 @@ Index: hook.c
 +    }
 +  }
 +#endif
-   else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK))
+   else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ICONVHOOK | M_ACCOUNTHOOK))
             && (!WithCrypto || !(data & M_CRYPTHOOK))
        )
-Index: init.h
+Index: mutt/init.h
 ===================================================================
---- init.h.orig	2007-03-01 22:20:35.279544696 +0100
-+++ init.h	2007-03-01 22:30:00.108677616 +0100
-@@ -3155,6 +3155,11 @@ struct command_t Commands[] = {
+--- mutt.orig/init.h	2007-03-13 20:53:07.000000000 +0100
++++ mutt/init.h	2007-03-13 20:59:30.000000000 +0100
+@@ -3167,6 +3167,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 },
-   { "group",		parse_group,		0 },
-   { "ungroup",		parse_ungroup,		0 },
 +#ifdef USE_COMPRESSED
 +  { "open-hook",	mutt_parse_hook,	M_OPENHOOK },
 +  { "close-hook",	mutt_parse_hook,	M_CLOSEHOOK },
 +  { "append-hook",	mutt_parse_hook,	M_APPENDHOOK },
 +#endif
+   { "group",		parse_group,		0 },
+   { "ungroup",		parse_ungroup,		0 },
    { "hdr_order",	parse_list,		UL &HeaderOrderList },
- #ifdef HAVE_ICONV
-   { "iconv-hook",	mutt_parse_hook,	M_ICONVHOOK }, 
-Index: main.c
+Index: mutt/main.c
 ===================================================================
---- main.c.orig	2007-03-01 22:20:46.386856128 +0100
-+++ main.c	2007-03-01 22:30:00.108677616 +0100
+--- mutt.orig/main.c	2007-03-13 20:53:07.000000000 +0100
++++ mutt/main.c	2007-03-13 20:59:30.000000000 +0100
 @@ -404,6 +404,12 @@ static void show_version (void)
  #else
  	"-LOCALES_HACK  "
@@ -879,10 +889,10 @@ Index: main.c
  	      
  #ifdef HAVE_WC_FUNCS
  	"+HAVE_WC_FUNCS  "
-Index: Makefile.am
+Index: mutt/Makefile.am
 ===================================================================
---- Makefile.am.orig	2007-03-01 22:20:46.454845792 +0100
-+++ Makefile.am	2007-03-01 22:30:00.108677616 +0100
+--- mutt.orig/Makefile.am	2007-03-13 20:53:07.000000000 +0100
++++ mutt/Makefile.am	2007-03-13 20:59:30.000000000 +0100
 @@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist.
  bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@
  mutt_SOURCES = $(BUILT_SOURCES) \
@@ -892,7 +902,7 @@ Index: Makefile.am
  	commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \
  	edit.c enter.c flags.c init.c filter.c from.c \
  	getdomain.c group.c \
-@@ -67,7 +67,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu
+@@ -66,7 +66,7 @@ EXTRA_mutt_SOURCES = account.c md5c.c mu
  	utf8.c wcwidth.c 
  
  EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \
@@ -901,10 +911,10 @@ Index: Makefile.am
  	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 \
-Index: mbox.c
+Index: mutt/mbox.c
 ===================================================================
---- mbox.c.orig	2007-03-01 22:08:48.131047608 +0100
-+++ mbox.c	2007-03-01 22:30:00.109677464 +0100
+--- mutt.orig/mbox.c	2007-03-13 20:53:07.000000000 +0100
++++ mutt/mbox.c	2007-03-13 20:59:30.000000000 +0100
 @@ -29,6 +29,10 @@
  #include "copy.h"
  #include "mutt_curses.h"
@@ -929,10 +939,10 @@ Index: mbox.c
    mutt_unblock_signals ();
    mx_fastclose_mailbox (ctx);
    return 0;
-Index: mutt.h
+Index: mutt/mutt.h
 ===================================================================
---- mutt.h.orig	2007-03-01 22:20:43.625275952 +0100
-+++ mutt.h	2007-03-01 22:30:00.109677464 +0100
+--- mutt.orig/mutt.h	2007-03-13 20:53:07.000000000 +0100
++++ mutt/mutt.h	2007-03-13 20:59:30.000000000 +0100
 @@ -159,6 +159,11 @@ typedef enum
  #define M_ACCOUNTHOOK	(1<<9)
  #define M_REPLYHOOK	(1<<10)
@@ -957,10 +967,10 @@ Index: mutt.h
    short magic;			/* mailbox type */
  
    unsigned char rights[(RIGHTSMAX + 7)/8];	/* ACL bits */
-Index: mx.c
+Index: mutt/mx.c
 ===================================================================
---- mx.c.orig	2007-03-01 22:08:48.223033624 +0100
-+++ mx.c	2007-03-01 22:30:00.110677312 +0100
+--- mutt.orig/mx.c	2007-03-13 20:53:07.000000000 +0100
++++ mutt/mx.c	2007-03-13 20:59:30.000000000 +0100
 @@ -30,6 +30,10 @@
  #include "keymap.h"
  #include "url.h"
@@ -983,9 +993,9 @@ Index: mx.c
    return (magic);
  }
  
-@@ -493,6 +501,13 @@ static int mx_open_mailbox_append (CONTE
- {
+@@ -494,6 +502,13 @@ static int mx_open_mailbox_append (CONTE
    struct stat sb;
+   mode_t omask;
  
 +#ifdef USE_COMPRESSED
 +  /* special case for appending to compressed folders -
@@ -997,7 +1007,7 @@ Index: mx.c
    ctx->append = 1;
  
  #ifdef USE_IMAP
-@@ -656,7 +671,12 @@ CONTEXT *mx_open_mailbox (const char *pa
+@@ -664,7 +679,12 @@ CONTEXT *mx_open_mailbox (const char *pa
    }
  
    ctx->magic = mx_get_magic (path);
@@ -1011,7 +1021,7 @@ Index: mx.c
    if(ctx->magic == 0)
      mutt_error (_("%s is not a mailbox."), path);
  
-@@ -762,6 +782,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
+@@ -770,6 +790,10 @@ void mx_fastclose_mailbox (CONTEXT *ctx)
      mutt_free_header (&ctx->hdrs[i]);
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);
@@ -1022,7 +1032,7 @@ Index: mx.c
    FREE (&ctx->path);
    FREE (&ctx->pattern);
    if (ctx->limit_pattern) 
-@@ -819,6 +843,12 @@ static int sync_mailbox (CONTEXT *ctx, i
+@@ -827,6 +851,12 @@ static int sync_mailbox (CONTEXT *ctx, i
    if (tmp && tmp->new == 0)
      mutt_update_mailbox (tmp);
  #endif
@@ -1035,7 +1045,7 @@ Index: mx.c
    return rc;
  }
  
-@@ -1020,6 +1050,11 @@ int mx_close_mailbox (CONTEXT *ctx, int 
+@@ -1028,6 +1058,11 @@ int mx_close_mailbox (CONTEXT *ctx, int 
        !mutt_is_spool(ctx->path) && !option (OPTSAVEEMPTY))
      mx_unlink_empty (ctx->path);
  
@@ -1047,7 +1057,7 @@ Index: mx.c
    mx_fastclose_mailbox (ctx);
  
    return 0;
-@@ -1329,6 +1364,11 @@ int mx_check_mailbox (CONTEXT *ctx, int 
+@@ -1342,6 +1377,11 @@ int mx_check_mailbox (CONTEXT *ctx, int 
  {
    int rc;
  
@@ -1059,10 +1069,10 @@ Index: mx.c
    if (ctx)
    {
      if (ctx->locked) lock = 0;
-Index: mx.h
+Index: mutt/mx.h
 ===================================================================
---- mx.h.orig	2007-03-01 22:08:48.272026176 +0100
-+++ mx.h	2007-03-01 22:30:00.110677312 +0100
+--- mutt.orig/mx.h	2007-03-13 20:53:07.000000000 +0100
++++ mutt/mx.h	2007-03-13 20:59:30.000000000 +0100
 @@ -40,6 +40,9 @@ enum
  #ifdef USE_POP
    , M_POP
@@ -1073,16 +1083,16 @@ Index: mx.h
  };
  
  WHERE short DefaultMagic INITVAL (M_MBOX);
-Index: PATCHES
+Index: mutt/PATCHES
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ PATCHES	2007-03-01 22:30:00.110677312 +0100
++++ mutt/PATCHES	2007-03-13 20:59:30.000000000 +0100
 @@ -0,0 +1 @@
-+patch-1.5.11.rr.compressed.1
-Index: po/de.po
++patch-1.5.14.rr.compressed.1
+Index: mutt/po/de.po
 ===================================================================
---- po/de.po.orig	2007-03-01 22:21:09.228383688 +0100
-+++ po/de.po	2007-03-01 22:30:00.112677008 +0100
+--- mutt.orig/po/de.po	2007-03-13 20:53:07.000000000 +0100
++++ mutt/po/de.po	2007-03-13 20:59:30.000000000 +0100
 @@ -1266,6 +1266,48 @@ msgstr "Prüfung des Absenders fehlgeschl
  msgid "Failed to figure out sender"
  msgstr "Kann Absender nicht ermitteln"
@@ -1162,10 +1172,10 @@ Index: po/de.po
  #. this means ctx->changed or ctx->deleted was set, but no
  #. * messages were found to be changed or deleted.  This should
  #. * never happen, is we presume it is a bug in mutt.
-Index: po/POTFILES.in
+Index: mutt/po/POTFILES.in
 ===================================================================
---- po/POTFILES.in.orig	2007-03-01 22:20:56.152371544 +0100
-+++ po/POTFILES.in	2007-03-01 22:30:00.112677008 +0100
+--- mutt.orig/po/POTFILES.in	2007-03-13 20:53:07.000000000 +0100
++++ mutt/po/POTFILES.in	2007-03-13 20:59:30.000000000 +0100
 @@ -8,6 +8,7 @@ charset.c
  color.c
  commands.c
@@ -1174,10 +1184,10 @@ Index: po/POTFILES.in
  crypt-gpgme.c
  crypt.c
  cryptglue.c
-Index: status.c
+Index: mutt/status.c
 ===================================================================
---- status.c.orig	2007-03-01 22:08:48.458997752 +0100
-+++ status.c	2007-03-01 22:30:00.113676856 +0100
+--- mutt.orig/status.c	2007-03-13 20:53:07.000000000 +0100
++++ mutt/status.c	2007-03-13 20:59:30.000000000 +0100
 @@ -97,6 +97,14 @@ status_format_str (char *buf, size_t buf
  
      case 'f':
diff --git a/debian/patches/features/compressed-folders.ranty-fix b/debian/patches/features/compressed-folders.ranty-fix
deleted file mode 100644
index 854ede1..0000000
--- a/debian/patches/features/compressed-folders.ranty-fix
+++ /dev/null
@@ -1,41 +0,0 @@
-# vi: ft=diff
-This patch by Manuel Estrada Sainz <ranty@debian.org> is an improvement
-to the compressed folder patch.
-
-It was received at Debian's BTS, Bug#210429.
-
-* Patch last synced with upstream:
-  - Date: unknown (mutt_1.5.6-20040523+1)
-  - File: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=210429&msg=11
-
-* Changes made: NONE.
-  
-== END PATCH
---- mutt.orig/compress.c	2003-09-11 19:26:34.000000000 +0200
-+++ mutt/compress.c		2003-09-11 19:58:05.000000000 +0200
-@@ -98,11 +98,23 @@
- int mutt_can_append_compressed (const char *path)
- {
-   int magic;
- 
-   if (is_new (path))
--    return (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0);
-+  {
-+    char *dir_path = safe_strdup(path);
-+    char *aux = strrchr(dir_path, '/');
-+    int dir_valid = 1;
-+    if (aux)
-+    {
-+      *aux='\0';
-+      if (access(dir_path, W_OK|X_OK))
-+        dir_valid = 0;
-+    }
-+    safe_free((void**)&dir_path);
-+    return dir_valid && (find_compress_hook (M_CLOSEHOOK, path) ? 1 : 0);
-+  }
- 
-   magic = mx_get_magic (path);
- 
-   if (magic != 0 && magic != M_COMPRESSED)
-     return 0;
-
diff --git a/debian/patches/misc/autotools-update.diff b/debian/patches/misc/autotools-update.diff
index f8c3255..a54361e 100644
--- a/debian/patches/misc/autotools-update.diff
+++ b/debian/patches/misc/autotools-update.diff
@@ -1,7 +1,7 @@
 Index: mutt/Makefile.in
 ===================================================================
---- mutt.orig/Makefile.in	2007-03-01 22:20:47.892627216 +0100
-+++ mutt/Makefile.in	2007-03-01 22:32:08.839107616 +0100
+--- mutt.orig/Makefile.in	2007-03-13 20:40:30.000000000 +0100
++++ mutt/Makefile.in	2007-03-13 21:08:37.000000000 +0100
 @@ -73,10 +73,10 @@ am__objects_1 = patchlist.$(OBJEXT)
  am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \
  	attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \
@@ -45,8 +45,8 @@ Index: mutt/Makefile.in
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@
 Index: mutt/config.h.in
 ===================================================================
---- mutt.orig/config.h.in	2007-03-01 22:20:48.710502880 +0100
-+++ mutt/config.h.in	2007-03-01 22:32:04.696737352 +0100
+--- mutt.orig/config.h.in	2007-03-12 19:15:58.000000000 +0100
++++ mutt/config.h.in	2007-03-13 21:08:09.000000000 +0100
 @@ -513,6 +513,9 @@
  /* Define to enable Sun mailtool attachments support. */
  #undef SUN_ATTACHMENT
@@ -59,8 +59,8 @@ Index: mutt/config.h.in
  
 Index: mutt/configure
 ===================================================================
---- mutt.orig/configure	2007-03-01 22:20:51.923014504 +0100
-+++ mutt/configure	2007-03-01 22:32:04.324793896 +0100
+--- mutt.orig/configure	2007-03-13 20:40:37.000000000 +0100
++++ mutt/configure	2007-03-13 21:08:33.000000000 +0100
 @@ -1367,6 +1367,7 @@ Optional Features:
    --enable-buffy-size     Use file size attribute instead of access time
    --enable-mailtool       Enable Sun mailtool attachments support
@@ -69,7 +69,7 @@ Index: mutt/configure
    --enable-exact-address  Enable regeneration of email addresses
    --enable-hcache         Enable header caching
    --disable-iconv         Disable iconv support
-@@ -15491,6 +15492,18 @@ _ACEOF
+@@ -15489,6 +15490,18 @@ _ACEOF
  fi
  
  
diff --git a/debian/patches/misc/doc-fix-reldate.h-location b/debian/patches/misc/doc-fix-reldate.h-location
index 0603854..ab2d846 100644
--- a/debian/patches/misc/doc-fix-reldate.h-location
+++ b/debian/patches/misc/doc-fix-reldate.h-location
@@ -1,16 +1,15 @@
-Index: mutt/doc/Makefile.in
+Index: trunk/doc/Makefile.in
 ===================================================================
---- mutt.orig/doc/Makefile.in	2007-02-16 00:38:54.388287904 +0100
-+++ mutt/doc/Makefile.in	2007-02-16 00:39:18.992547488 +0100
-@@ -477,9 +477,9 @@ mutt.1: $(srcdir)/mutt.man
- 	$(EDIT) $(srcdir)/mutt.man > $@
+--- trunk.orig/doc/Makefile.in	2007-03-15 15:47:11.000000000 +0100
++++ trunk/doc/Makefile.in	2007-03-15 15:48:18.000000000 +0100
+@@ -483,8 +483,8 @@ mutt.1: $(srcdir)/mutt.man
  
- stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/init.h manual.xml.head manual.xml.tail \
+ stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.xml.head \
+                $(top_srcdir)/functions.h $(top_srcdir)/OPS* manual.xml.tail \
 -               $(top_srcdir)/VERSION ../reldate.h
-+               $(top_srcdir)/VERSION ../../reldate.h
- 	$(MAKE) ../makedoc$(EXEEXT)
 -	( date=`cut -d\" -f2 ../reldate.h`; \
++               $(top_srcdir)/VERSION ../../reldate.h
 +	( date=`cut -d\" -f2 ../../reldate.h`; \
  	  sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` ($$date)/" $(srcdir)/manual.xml.head ;\
- 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
- 		cat - $(srcdir)/manual.xml.tail > manual.xml
+ 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ;\
+ 	  perl $(srcdir)/gen-map-doc $(top_srcdir)/functions.h $(top_srcdir)/OPS* < $(srcdir)/manual.xml.tail \
diff --git a/debian/patches/misc/fix-reldate-location.diff b/debian/patches/misc/fix-reldate-location.diff
deleted file mode 100644
index fe3fe58..0000000
--- a/debian/patches/misc/fix-reldate-location.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -182,9 +182,9 @@
- 	$(EDIT) $(srcdir)/mutt.man > $@
- 
- stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/init.h manual.xml.head manual.xml.tail \
--               $(top_srcdir)/VERSION $(top_srcdir)/reldate.h
-+               $(top_srcdir)/VERSION $(top_builddir)/reldate.h
- 	$(MAKE) ../makedoc$(EXEEXT)
--	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` (`cut -d\\" -f2 $(top_srcdir)/reldate.h`)/" $(srcdir)/manual.xml.head ;\
-+	( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION` (`cut -d\\" -f2 $(top_builddir)/reldate.h`)/" $(srcdir)/manual.xml.head ;\
- 	  $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) |      \
- 		cat - $(srcdir)/manual.xml.tail > manual.xml
- 	touch stamp-doc-xml
diff --git a/debian/patches/series b/debian/patches/series
index f699ac5..2bce73d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 # compressed folders need an autotools rerun
-features/compressed-folders -p0
-features/compressed-folders.ranty-fix
+features/compressed-folders
 features/compressed-folders.debian
 
 # build system patches
@@ -8,6 +7,7 @@ misc/autotools-update.diff
 debian-specific/Md.sasl2_needs_md5.diff -p0
 debian-specific/dont_rebuild_po_files.diff -p0
 debian-specific/build_doc_adjustments.diff -p0
+debian-specific/sort-patchlist
 misc/doc-fix-reldate.h-location
 
 # features
@@ -19,11 +19,12 @@ features/purge-message
 features-old/patch-1.5.4.vk.pgp_verbose_mime
 
 # Debian config
-debian-specific/Md.Muttrc.diff -p0
+debian-specific/Muttrc
 debian-specific/Md.etc_mailname_gethostbyname.diff -p0
 debian-specific/use_usr_bin_editor.diff -p0
 debian-specific/correct_docdir_in_man_page.diff -p0
 debian-specific/dont_document_not_present_features.diff -p0
+debian-specific/assumed_charset-compat
 misc/define-pgp_getkeys_command.diff -p0
 misc/gpg.rc-paths
 
diff --git a/debian/rules b/debian/rules
index b7c71cd..34b3edb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,24 @@
 #!/usr/bin/make -f
 
-###
+include /usr/share/quilt/quilt.make
 
+###
 # Uncomment one of these if you're rebuilding using them instead of libdb4.X
 # HCACHE_DB := gdbm
 # HCACHE_DB := qdbm
-
 ###
 
 # Configure arguments
 
-confflags  = 	--prefix=/usr			\
+hcache_db := --without-gdbm --without-qdbm
+ifeq ($(HCACHE_DB),gdbm)
+    hcache_db := --without-qdbm --without-bdb
+endif
+ifeq ($(HCACHE_DB),qdbm)
+    hcache_db := --without-gdbm --without-bdb
+endif
+
+confflags =	--prefix=/usr			\
 		--sysconfdir=/etc		\
 		--mandir=/usr/share/man		\
 		--with-sharedir=/usr/share/mutt	\
@@ -39,61 +47,31 @@ confflags  = 	--prefix=/usr			\
 
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
 confflags += --build $(DEB_BUILD_GNU_TYPE)
-
 # Only specify --host when cross-compiling
 ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
     confflags += --host $(DEB_HOST_GNU_TYPE)
 endif
 
-#
-
-hcache_db := --without-gdbm --without-qdbm
-
-ifeq ($(HCACHE_DB),gdbm)
-    hcache_db := --without-qdbm --without-bdb
-endif
-
-ifeq ($(HCACHE_DB),qdbm)
-    hcache_db := --without-gdbm --without-bdb
-endif
-
-###
-
-# Directory to make the build on
-
-objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
-
-###
-
 # CFLAGS
-
 CFLAGS   = -Wall -g
 CPPFLAGS = -I/usr/include/qdbm
-
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 	CFLAGS += -O0
 else
 	CFLAGS += -O2
 endif
 
-###
+# Directory to make the build on
+objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE)
 
 configure: $(objdir)/configure-stamp
-$(objdir)/configure-stamp:
+$(objdir)/configure-stamp: $(QUILT_STAMPFN)
 	dh_testdir
 	
 	ln -sf /usr/share/misc/config.sub .
 	ln -sf /usr/share/misc/config.guess .
 	
-	ln -sf debian/patches
-	quilt push -a || test $$? = 2
-	
-	# sort the patches as printed by mutt -v
-	[ -e PATCHES.unsorted ] || mv PATCHES PATCHES.unsorted && \
-	env LC_COLLATE=C sort PATCHES.unsorted >PATCHES
-	
 	# do not rebuild these files
 	touch configure.in aclocal.m4 Makefile.in configure config.h.in
 	
@@ -106,70 +84,38 @@ $(objdir)/configure-stamp:
 	
 	touch $@
 
-#
-
-build: $(objdir)/build-stamp
+build build-arch: $(objdir)/build-stamp
 $(objdir)/build-stamp: $(objdir)/configure-stamp
-	cd $(objdir) && \
-	$(MAKE) CFLAGS="$(CFLAGS)"
-	
+	cd $(objdir) && $(MAKE) CFLAGS="$(CFLAGS)"
 	touch $@
 
-#
-
-clean:
-	dh_testdir
-	dh_testroot
-	
-	[ ! -e PATCHES.unsorted ] || mv PATCHES.unsorted PATCHES
-	quilt pop -a -R || test $$? = 2
-	
-	# quilt cruft
-	rm -f   patches
-	rm -rf .pc
-	touch PATCHES
-	
-	# please dpkg-source
-	rm -f po/*.gmo
-	rm -f config.guess config.sub
-	
-	# remove build tree
-	rm -rf $(objdir)
-	
-	dh_clean
-	
-#
-
 install: debian/tmp/install-stamp
-debian/tmp/install-stamp:
+debian/tmp/install-stamp: $(objdir)/build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean
 	cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	
-	cd debian/tmp/usr/share/doc; \
-	rm -rf samples/iconv samples/ca-bundle.crt; \
-	mv NEWS NEWS.old; \
-	mv ChangeLog.old changelog.old; \
+	cd debian/tmp/usr/share/doc && \
+	rm -rf samples/iconv samples/ca-bundle.crt && \
+	mv NEWS NEWS.old && \
+	mv ChangeLog.old changelog.old && \
 	cp $(CURDIR)/UPDATING NEWS
 	
 	chmod +x debian/extra/lib/*
 	chmod +x debian/header.awk
 	debian/header.awk debian/patches/features/* >debian/tmp/README.Patches
 	
-	( cat $(objdir)/Muttrc.head; \
-	  echo "# GnuPG configuration"; \
+	( sed -e '/## More settings/,$$d' $(objdir)/Muttrc || exit 1 ; \
+	  cat debian/extra/rc/Muttrc.foot ) > debian/tmp/Muttrc
+	
+	( echo "# GnuPG configuration"; \
 	  grep '^set' contrib/gpg.rc; \
-	  echo; \
-	  cat debian/extra/rc/* ) > debian/tmp/Muttrc
+	  echo ) > debian/tmp/gpg.rc
 	
 	touch $@
 
-#
-
-binary: binary-arch
-
-binary-arch: build install
+binary binary-arch: build install
 	dh_testdir
 	dh_testroot
 	
@@ -194,6 +140,18 @@ binary-arch: build install
 binary-indep:
 	@echo "Nothing to do."
 
-#
+clean: unpatch
+	dh_testdir
+	dh_testroot
+	
+	# please dpkg-source
+	rm -f po/*.gmo
+	rm -f config.guess config.sub
+	touch PATCHES
+	
+	# remove build tree
+	rm -rf $(objdir)
+	
+	dh_clean
 
-.PHONY: configure build clean install binary binary-arch binary-indep
+.PHONY: configure build build-arch build-indep clean install binary binary-arch binary-indep patch