X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/4c13acfc45a942f5f481ce6a3dfcea461da505ad..5ed138215ee476f7451fe07201732104fb24e269:/upstream/extra-patches/compressed-folders?ds=sidebyside diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders index f12621e..5ad6cd0 100644 --- a/upstream/extra-patches/compressed-folders +++ b/upstream/extra-patches/compressed-folders @@ -7,19 +7,19 @@ The home page for this patch is: http://www.spinnaker.de/mutt/compressed/ * Patch last synced with upstream: - - Date: 2005-03-10 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.8.rr.compressed.1.gz + - Date: 2005-04-03 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.9.rr.compressed.1.gz * Changes made: - filterdiff -p1 \ - $(for f in Makefile.in config.h.in configure Muttrc doc/manual.txt \ + $(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) - 2005-03-10: fix configure.in to match latest CVS. == END PATCH -diff -urN mutt-1.5.8/compress.c mutt-1.5.8-ro/compress.c ---- mutt-1.5.8/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.8-ro/compress.c 2005-02-13 18:54:39.000000000 +0100 +diff -urN mutt-1.5.9/compress.c mutt-1.5.9-ro/compress.c +--- mutt-1.5.9/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.9-ro/compress.c 2005-03-20 14:06:20.000000000 +0100 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -508,9 +508,9 @@ diff -urN mutt-1.5.8/compress.c mutt-1.5.8-ro/compress.c +} + +#endif /* USE_COMPRESSED */ -diff -urN mutt-1.5.8/compress.h mutt-1.5.8-ro/compress.h ---- mutt-1.5.8/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.8-ro/compress.h 2005-02-13 18:54:39.000000000 +0100 +diff -urN mutt-1.5.9/compress.h mutt-1.5.9-ro/compress.h +--- mutt-1.5.9/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.9-ro/compress.h 2005-03-20 14:06:20.000000000 +0100 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -539,12 +539,12 @@ diff -urN mutt-1.5.8/compress.h mutt-1.5.8-ro/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -diff -urN mutt-1.5.8/config.h.in mutt-1.5.8-ro/config.h.in -diff -urN mutt-1.5.8/configure mutt-1.5.8-ro/configure -diff -urN mutt-1.5.8/configure.in mutt-1.5.8-ro/configure.in ---- mutt-1.5.8/configure.in 2005-02-12 21:57:16.000000000 +0100 -+++ mutt-1.5.8-ro/configure.in 2005-02-13 18:54:39.000000000 +0100 -@@ -776,6 +776,11 @@ +diff -urN mutt-1.5.9/config.h.in mutt-1.5.9-ro/config.h.in +diff -urN mutt-1.5.9/configure mutt-1.5.9-ro/configure +diff -urN mutt-1.5.9/configure.in mutt-1.5.9-ro/configure.in +--- mutt-1.5.9/configure.in 2005-03-13 17:36:01.000000000 +0100 ++++ mutt-1.5.9-ro/configure.in 2005-03-20 14:11:05.000000000 +0100 +@@ -777,6 +777,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -556,9 +556,9 @@ diff -urN mutt-1.5.8/configure.in mutt-1.5.8-ro/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", -diff -urN mutt-1.5.8/curs_main.c mutt-1.5.8-ro/curs_main.c ---- mutt-1.5.8/curs_main.c 2005-02-12 20:22:15.000000000 +0100 -+++ mutt-1.5.8-ro/curs_main.c 2005-02-13 18:54:39.000000000 +0100 +diff -urN mutt-1.5.9/curs_main.c mutt-1.5.9-ro/curs_main.c +--- mutt-1.5.9/curs_main.c 2005-02-28 19:36:35.000000000 +0100 ++++ mutt-1.5.9-ro/curs_main.c 2005-03-20 14:06:20.000000000 +0100 @@ -1076,6 +1076,11 @@ { int check; @@ -571,14 +571,14 @@ diff -urN mutt-1.5.8/curs_main.c mutt-1.5.8-ro/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -urN mutt-1.5.8/doc/manual-4.html mutt-1.5.8-ro/doc/manual-4.html -diff -urN mutt-1.5.8/doc/manual-6.html mutt-1.5.8-ro/doc/manual-6.html -diff -urN mutt-1.5.8/doc/manual.html mutt-1.5.8-ro/doc/manual.html -diff -urN mutt-1.5.8/doc/manual.sgml mutt-1.5.8-ro/doc/manual.sgml -diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head ---- mutt-1.5.8/doc/manual.sgml.head 2005-02-12 20:41:36.000000000 +0100 -+++ mutt-1.5.8-ro/doc/manual.sgml.head 2005-02-13 18:54:39.000000000 +0100 -@@ -2537,6 +2537,176 @@ +diff -urN mutt-1.5.9/doc/manual-4.html mutt-1.5.9-ro/doc/manual-4.html +diff -urN mutt-1.5.9/doc/manual-6.html mutt-1.5.9-ro/doc/manual-6.html +diff -urN mutt-1.5.9/doc/manual.html mutt-1.5.9-ro/doc/manual.html +diff -urN mutt-1.5.9/doc/manual.sgml mutt-1.5.9-ro/doc/manual.sgml +diff -urN mutt-1.5.9/doc/manual.sgml.head mutt-1.5.9-ro/doc/manual.sgml.head +--- mutt-1.5.9/doc/manual.sgml.head 2005-02-19 14:49:49.000000000 +0100 ++++ mutt-1.5.9-ro/doc/manual.sgml.head 2005-03-20 14:06:20.000000000 +0100 +@@ -2539,6 +2539,176 @@ macro pager \cb |urlview\n @@ -755,7 +755,7 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head Mutt's MIME Support

Quite a bit of effort has been made to make Mutt the premier text-mode -@@ -3116,6 +3286,8 @@ +@@ -3118,6 +3288,8 @@ @@ -764,7 +764,7 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head @@ -773,7 +773,7 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head @@ -782,11 +782,11 @@ diff -urN mutt-1.5.8/doc/manual.sgml.head mutt-1.5.8-ro/doc/manual.sgml.head "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - macro pager "!less /usr/local/doc/mutt/manual.txt\n" "Show Mutt documentation" - -+# 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. - # -diff -urN mutt-1.5.8/Muttrc.head.in mutt-1.5.8-ro/Muttrc.head.in ---- mutt-1.5.8/Muttrc.head.in 2002-01-24 13:10:47.000000000 +0100 -+++ mutt-1.5.8-ro/Muttrc.head.in 2005-02-13 18:54:40.000000000 +0100 -@@ -19,6 +19,11 @@ - macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" - macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" - -+# 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. - # -diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c ---- mutt-1.5.8/mx.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.8-ro/mx.c 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/Muttrc mutt-1.5.9-ro/Muttrc +diff -urN mutt-1.5.9/Muttrc.head mutt-1.5.9-ro/Muttrc.head +diff -urN mutt-1.5.9/Muttrc.head.in mutt-1.5.9-ro/Muttrc.head.in +diff -urN mutt-1.5.9/mx.c mutt-1.5.9-ro/mx.c +--- mutt-1.5.9/mx.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.9-ro/mx.c 2005-03-20 14:06:20.000000000 +0100 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -1082,9 +1054,9 @@ diff -urN mutt-1.5.8/mx.c mutt-1.5.8-ro/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -urN mutt-1.5.8/mx.h mutt-1.5.8-ro/mx.h ---- mutt-1.5.8/mx.h 2003-08-05 15:58:16.000000000 +0200 -+++ mutt-1.5.8-ro/mx.h 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/mx.h mutt-1.5.9-ro/mx.h +--- mutt-1.5.9/mx.h 2003-08-05 15:58:16.000000000 +0200 ++++ mutt-1.5.9-ro/mx.h 2005-03-20 14:06:20.000000000 +0100 @@ -40,6 +40,9 @@ #ifdef USE_POP , M_POP @@ -1095,15 +1067,15 @@ diff -urN mutt-1.5.8/mx.h mutt-1.5.8-ro/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -urN mutt-1.5.8/PATCHES mutt-1.5.8-ro/PATCHES ---- mutt-1.5.8/PATCHES 2005-02-12 21:55:51.000000000 +0100 -+++ mutt-1.5.8-ro/PATCHES 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/PATCHES mutt-1.5.9-ro/PATCHES +--- mutt-1.5.9/PATCHES 2005-03-13 17:33:06.000000000 +0100 ++++ mutt-1.5.9-ro/PATCHES 2005-03-20 17:59:28.000000000 +0100 @@ -0,0 +1 @@ -+patch-1.5.8.rr.compressed.1 -diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po ---- mutt-1.5.8/po/de.po 2005-02-12 21:58:50.000000000 +0100 -+++ mutt-1.5.8-ro/po/de.po 2005-02-13 18:56:06.000000000 +0100 -@@ -710,6 +710,48 @@ ++patch-1.5.9.rr.compressed.1 +diff -urN mutt-1.5.9/po/de.po mutt-1.5.9-ro/po/de.po +--- mutt-1.5.9/po/de.po 2005-03-13 17:38:22.000000000 +0100 ++++ mutt-1.5.9-ro/po/de.po 2005-03-20 14:06:20.000000000 +0100 +@@ -715,6 +715,48 @@ msgid "PGP already selected. Clear & continue ? " msgstr "PGP bereits ausgewählt. Löschen und weiter?" @@ -1152,7 +1124,7 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1300,6 +1342,10 @@ +@@ -1305,6 +1347,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -1163,7 +1135,7 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/po/de.po #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -2713,18 +2759,10 @@ +@@ -2737,18 +2783,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -1182,9 +1154,9 @@ diff -urN mutt-1.5.8/po/de.po mutt-1.5.8-ro/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. -diff -urN mutt-1.5.8/po/POTFILES.in mutt-1.5.8-ro/po/POTFILES.in ---- mutt-1.5.8/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100 -+++ mutt-1.5.8-ro/po/POTFILES.in 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/po/POTFILES.in mutt-1.5.9-ro/po/POTFILES.in +--- mutt-1.5.9/po/POTFILES.in 2002-03-27 09:44:17.000000000 +0100 ++++ mutt-1.5.9-ro/po/POTFILES.in 2005-03-20 14:06:20.000000000 +0100 @@ -8,6 +8,7 @@ color.c commands.c @@ -1193,9 +1165,9 @@ diff -urN mutt-1.5.8/po/POTFILES.in mutt-1.5.8-ro/po/POTFILES.in crypt.c curs_lib.c curs_main.c -diff -urN mutt-1.5.8/status.c mutt-1.5.8-ro/status.c ---- mutt-1.5.8/status.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.8-ro/status.c 2005-02-13 18:54:40.000000000 +0100 +diff -urN mutt-1.5.9/status.c mutt-1.5.9-ro/status.c +--- mutt-1.5.9/status.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.9-ro/status.c 2005-03-20 14:06:20.000000000 +0100 @@ -97,6 +97,14 @@ case 'f':