X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/0f5e4342667cce1fa29459d8ce4ccb70a7c8cf7a..76a54b65b4d405cea98a5d5b18d2030b4ed9b556:/debian/patches/features/compressed-folders?ds=sidebyside diff --git a/debian/patches/features/compressed-folders b/debian/patches/features/compressed-folders index 73e20e2..b1abd8c 100644 --- a/debian/patches/features/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -7,11 +7,14 @@ The home page for this patch is: http://www.spinnaker.de/mutt/compressed/ * Patch last synced with upstream: - - Date: 2007-06-14 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.16.rr.compressed.1.gz + - Date: 2008-05-20 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.18.rr.compressed.1.gz * Changes made: - - 2007-06-14 myon: remove hunks for Muttrc* + - 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 @@ -548,7 +551,7 @@ The home page for this patch is: +void mutt_fast_close_compressed (CONTEXT *); --- a/configure.ac +++ b/configure.ac -@@ -791,6 +791,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN +@@ -795,6 +795,11 @@ AC_ARG_ENABLE(locales-fix, AC_HELP_STRIN AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -562,7 +565,7 @@ The home page for this patch is: AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", --- a/curs_main.c +++ b/curs_main.c -@@ -1131,6 +1131,11 @@ int mutt_index_menu (void) +@@ -1128,6 +1128,11 @@ int mutt_index_menu (void) { int check; @@ -576,7 +579,7 @@ The home page for this patch is: --- a/doc/manual.xml.head +++ b/doc/manual.xml.head -@@ -5010,6 +5010,205 @@ becomes an issue as mutt will silently f +@@ -5160,6 +5160,205 @@ macro pager \cb |urlview\n @@ -782,6 +785,20 @@ The home page for this patch is: Mutt's MIME Support +--- a/doc/Muttrc.head ++++ b/doc/Muttrc.head +@@ -29,6 +29,11 @@ macro generic,pager " + macro index,pager y "?" "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.man.head +++ b/doc/muttrc.man.head @@ -345,6 +345,24 @@ specify the ID of the public key to be u @@ -841,7 +858,7 @@ The home page for this patch is: ) --- a/init.h +++ b/init.h -@@ -3193,6 +3193,11 @@ struct command_t Commands[] = { +@@ -3452,6 +3452,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 }, @@ -855,7 +872,7 @@ The home page for this patch is: { "hdr_order", parse_list, UL &HeaderOrderList }, --- a/main.c +++ b/main.c -@@ -401,6 +401,12 @@ static void show_version (void) +@@ -402,6 +402,12 @@ static void show_version (void) #else "-LOCALES_HACK " #endif @@ -872,15 +889,15 @@ The home page for this patch is: +++ b/Makefile.am @@ -18,7 +18,7 @@ BUILT_SOURCES = keymap_defs.h patchlist. bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ - mutt_SOURCES = $(BUILT_SOURCES) \ + mutt_SOURCES = \ addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ - crypt.c cryptglue.c \ + crypt.c cryptglue.c compress.c \ 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 \ -@@ -66,7 +66,7 @@ EXTRA_mutt_SOURCES = account.c md5.c mut - utf8.c wcwidth.c +@@ -57,7 +57,7 @@ EXTRA_mutt_SOURCES = account.c bcache.c + bcache.h browser.h hcache.h mbyte.h mutt_idna.h remailer.h url.h EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO UPDATING \ - configure account.h \ @@ -901,7 +918,7 @@ The home page for this patch is: #include #include #include -@@ -1026,6 +1030,12 @@ bail: /* Come here in case of disaster +@@ -1038,6 +1042,12 @@ bail: /* Come here in case of disaster int mbox_close_mailbox (CONTEXT *ctx) { mx_unlock_file (ctx->path, fileno (ctx->fp), 1); @@ -916,7 +933,7 @@ The home page for this patch is: return 0; --- a/mutt.h +++ b/mutt.h -@@ -160,6 +160,11 @@ typedef enum +@@ -140,6 +140,11 @@ typedef enum #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -928,7 +945,7 @@ The home page for this patch is: /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -891,6 +896,11 @@ typedef struct _context +@@ -872,6 +877,11 @@ typedef struct _context int flagged; /* how many flagged messages */ int msgnotreadyet; /* which msg "new" in pager, -1 if none */ @@ -1052,28 +1069,52 @@ The home page for this patch is: }; WHERE short DefaultMagic INITVAL (M_MBOX); ---- a/PATCHES -+++ b/PATCHES -@@ -4,3 +4,4 @@ patch-1.5.13.cd.purge_message.3.4 - patch-1.5.13.nt+ab.xtitles.4 - patch-1.5.13.cd.ifdef.2 - patch-1.5.8.hr.sensible_browser_position.3 -+patch-1.5.16.rr.compressed.1 --- a/po/de.po +++ b/po/de.po @@ -3,7 +3,7 @@ msgstr "" - "Project-Id-Version: 1.5.16\n" + "Project-Id-Version: 1.5.18\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-06-09 20:30-0700\n" --"PO-Revision-Date: 2007-06-10 17:18+0200\n" -+"PO-Revision-Date: 2007-09-08 22:04+0200\n" + "POT-Creation-Date: 2009-01-05 16:36-0800\n" +-"PO-Revision-Date: 2008-05-18 10:28+0200\n" ++"PO-Revision-Date: 2009-01-15 23:09+0100\n" "Last-Translator: Roland Rosenfeld \n" "Language-Team: German \n" "MIME-Version: 1.0\n" -@@ -1279,6 +1279,48 @@ msgstr "Prüfung des Absenders fehlgeschl - msgid "Failed to figure out sender" - msgstr "Kann Absender nicht ermitteln" +@@ -1975,6 +1975,10 @@ msgstr "Hilfe für %s" + msgid "Bad history file format (line %d)" + msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)" + ++#: hook.c:96 ++msgid "badly formatted command string" ++msgstr "Hook enthält nicht die Muster %f und %t" ++ + #: hook.c:251 + #, c-format + msgid "unhook: Can't do unhook * from within a hook." +@@ -2718,18 +2722,10 @@ msgstr "Lese %s..." + msgid "Mailbox is corrupt!" + msgstr "Mailbox fehlerhaft!" +-#: mbox.c:678 +-msgid "Mailbox was corrupted!" +-msgstr "Mailbox wurde zerstört!" +- + #: mbox.c:719 mbox.c:976 + msgid "Fatal error! Could not reopen mailbox!" + msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" + +-#: mbox.c:728 +-msgid "Unable to lock mailbox!" +-msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" +- + #. 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. +@@ -5298,3 +5294,45 @@ msgstr "Zeige S/MIME Optionen" + + #~ msgid "Authentication method is unknown." + #~ msgstr "Authentifizierungsmethode unbekannt." ++ +#: compress.c:203 mbox.c:661 +msgid "Mailbox was corrupted!" +msgstr "Mailbox wurde zerstört!" @@ -1115,40 +1156,6 @@ 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" -+ - #: crypt.c:69 - #, c-format - msgid " (current time: %c)" -@@ -1948,6 +1990,10 @@ msgstr "Hilfe für %s" - msgid "Bad history file format (line %d)" - msgstr "Falsches Format der Datei früherer Eingaben (Zeile %d)" - -+#: hook.c:96 -+msgid "badly formatted command string" -+msgstr "Hook enthält nicht die Muster %f und %t" -+ - #: hook.c:251 - #, c-format - msgid "unhook: Can't do unhook * from within a hook." -@@ -3452,18 +3498,10 @@ msgstr "Lese %s..." - msgid "Mailbox is corrupt!" - msgstr "Mailbox fehlerhaft!" - --#: mbox.c:670 --msgid "Mailbox was corrupted!" --msgstr "Mailbox wurde zerstört!" -- - #: mbox.c:711 mbox.c:964 - msgid "Fatal error! Could not reopen mailbox!" - msgstr "Fataler Fehler, konnte Mailbox nicht erneut öffnen!" - --#: mbox.c:720 --msgid "Unable to lock mailbox!" --msgstr "Kann Mailbox nicht für exklusiven Zugriff sperren!" -- - #. 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. --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -8,6 +8,7 @@ charset.c @@ -1161,7 +1168,7 @@ The home page for this patch is: cryptglue.c --- a/status.c +++ b/status.c -@@ -99,6 +99,14 @@ status_format_str (char *buf, size_t buf +@@ -96,6 +96,14 @@ status_format_str (char *buf, size_t buf case 'f': snprintf (fmt, sizeof(fmt), "%%%ss", prefix); @@ -1169,10 +1176,14 @@ The home page for this patch is: + if (Context && Context->compressinfo && Context->realpath) + { + strfcpy (tmp, Context->realpath, sizeof (tmp)); -+ mutt_pretty_mailbox (tmp); ++ mutt_pretty_mailbox (tmp, sizeof (tmp)); + } + else +#endif if (Context && Context->path) { strfcpy (tmp, Context->path, sizeof (tmp)); +--- a/PATCHES ++++ b/PATCHES +@@ -0,0 +1 @@ ++patch-1.5.18.rr.compressed.1