Grab two patches from upstream that should also go into lenny

[software/mutt-debian.git] / debian / patches / features / compressed-folders

diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders
index c6c439dd75934ef2d661bea68cc15137c0a04fea..b1abd8cac707aee7981e191315b1713c24aa2d18 100644 (file)
--- a/debian/patches/features/compressed-folders
+++ b/debian/patches/features/compressed-folders
@@ -14,6 +14,7 @@ The home page for this patch is:
   - 2008-05-20 myon: refreshed to remove hunks in auto* files
   - 2009-09-15 myon: refreshed for mutt-1.5.19
                      status.c:103: add sizeof (tmp) to mutt_pretty_mailbox
   - 2008-05-20 myon: refreshed to remove hunks in auto* files
   - 2009-09-15 myon: refreshed for mutt-1.5.19
                      status.c:103: add sizeof (tmp) to mutt_pretty_mailbox

+  - 2009-09-15 scotton: removed doc/Muttrc for mutt-1.5.19 (only patch doc/Muttrc.head)

 
 == END PATCH
 --- /dev/null
 
 == END PATCH
 --- /dev/null


@@ -784,20 +785,6 @@ The home page for this patch is:
  <chapter id="mimesupport">
  <title>Mutt's MIME Support</title>
  
  <chapter id="mimesupport">
  <title>Mutt's MIME Support</title>
  

---- a/doc/Muttrc
-+++ b/doc/Muttrc
-@@ -29,6 +29,11 @@ macro generic,pager <F1> "<shell-escape>
- macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
- bind browser y exit
- 
-+# Use folders which match on \\.gz$ as gzipped folders:
-+# open-hook \\.gz$ "gzip -cd %f > %t"
-+# close-hook \\.gz$ "gzip -c %t > %f"
-+# append-hook \\.gz$ "gzip -c %t >> %f"
-+
- # If Mutt is unable to determine your site's domain name correctly, you can
- # set the default here.
- #

 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head
 @@ -29,6 +29,11 @@ macro generic,pager <F1> "<shell-escape>
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head
 @@ -29,6 +29,11 @@ macro generic,pager <F1> "<shell-escape>