From: Jakub Bogusz Date: Fri, 25 Jul 2008 16:39:25 +0000 (+0000) Subject: - updated for 1.5.18 X-Git-Tag: auto/th/mutt-1_5_18-1~2 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fmutt.git;a=commitdiff_plain;h=91acbdc1a416aa84c2520be77df73f32c08b8fd5 - updated for 1.5.18 Changed files: mutt-Muttrc.patch -> 1.2 mutt-Muttrc_mbox_path.patch -> 1.2 mutt-bj.status-time.patch -> 1.3 mutt-manual.patch -> 1.7 mutt-pl.po-update.patch -> 1.5 mutt-rr.compressed.patch -> 1.11 mutt-send_charset.patch -> 1.2 mutt-vvv.nntp.patch -> 1.9 --- diff --git a/mutt-Muttrc.patch b/mutt-Muttrc.patch index cb2a76b..bd3d4ce 100644 --- a/mutt-Muttrc.patch +++ b/mutt-Muttrc.patch @@ -1,6 +1,5 @@ -diff -urN mutt-1.5.14.org/Muttrc mutt-1.5.14/Muttrc ---- mutt-1.5.14.org/Muttrc 2007-04-25 08:29:15.220571000 +0200 -+++ mutt-1.5.14/Muttrc 2007-04-25 08:31:58.895287410 +0200 +--- mutt-1.5.18.org/doc/Muttrc 2007-04-25 08:29:15.220571000 +0200 ++++ mutt-1.5.18/doc/Muttrc 2007-04-25 08:31:58.895287410 +0200 @@ -3692,6 +3692,7 @@ # a value of zero for this option suppresses the pause. # diff --git a/mutt-Muttrc_mbox_path.patch b/mutt-Muttrc_mbox_path.patch index 3beeb56..30b1aef 100644 --- a/mutt-Muttrc_mbox_path.patch +++ b/mutt-Muttrc_mbox_path.patch @@ -1,6 +1,5 @@ -diff -Nur mutt-1.4.2.1.orig/Muttrc mutt-1.4.2.1/Muttrc ---- mutt-1.4.2.1.orig/Muttrc 2004-03-04 18:10:37.000000000 +0100 -+++ mutt-1.4.2.1/Muttrc 2004-03-04 18:17:10.000000000 +0100 +--- mutt-1.5.18.orig/doc/Muttrc 2004-03-04 18:10:37.000000000 +0100 ++++ mutt-1.5.18/doc/Muttrc 2004-03-04 18:17:10.000000000 +0100 @@ -1360,7 +1360,7 @@ # will be shown. The match is always case-sensitive. # diff --git a/mutt-bj.status-time.patch b/mutt-bj.status-time.patch index 6f3f6e3..690c51a 100644 --- a/mutt-bj.status-time.patch +++ b/mutt-bj.status-time.patch @@ -10,26 +10,16 @@ diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/curs_main.c mutt-1.5.10/curs_main { menu_status_line (buf, sizeof (buf), menu, NONULL (Status)); CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2); -Only in mutt-1.5.10/doc: manual-1.html -Only in mutt-1.5.10/doc: manual-2.html -Only in mutt-1.5.10/doc: manual-3.html -Only in mutt-1.5.10/doc: manual-4.html -Only in mutt-1.5.10/doc: manual-5.html -Only in mutt-1.5.10/doc: manual-6.html -Only in mutt-1.5.10/doc: manual-7.html -Only in mutt-1.5.10/doc: manual.html -Only in mutt-1.5.10/doc: manual.txt -diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/globals.h mutt-1.5.10/globals.h ---- mutt-1.5.10.orig/globals.h 2005-08-03 11:17:46.000000000 +0200 -+++ mutt-1.5.10/globals.h 2005-10-07 09:28:24.000000000 +0200 -@@ -174,6 +174,7 @@ - WHERE short ReadInc; +--- mutt-1.5.18/globals.h.orig 2008-01-30 05:26:50.000000000 +0100 ++++ mutt-1.5.18/globals.h 2008-07-25 17:41:02.532746787 +0200 +@@ -200,6 +200,7 @@ + WHERE short SaveHist; WHERE short SendmailWait; WHERE short SleepTime INITVAL (1); +WHERE short StatusUpdate; + WHERE short TimeInc; WHERE short Timeout; - WHERE short WrapMargin; - WHERE short WriteInc; + WHERE short Wrap; diff -dur -x '*~' -x '*.orig' mutt-1.5.10.orig/init.h mutt-1.5.10/init.h --- mutt-1.5.10.orig/init.h 2005-10-07 09:28:10.000000000 +0200 +++ mutt-1.5.10/init.h 2005-10-07 09:28:24.000000000 +0200 diff --git a/mutt-manual.patch b/mutt-manual.patch index be89e91..d293c1b 100644 --- a/mutt-manual.patch +++ b/mutt-manual.patch @@ -1,5 +1,5 @@ ---- mutt-1.5.13/Muttrc.head.in.orig 2006-08-23 22:29:05.494260250 +0200 -+++ mutt-1.5.13/Muttrc.head 2006-08-23 22:29:30.383815750 +0200 +--- mutt-1.5.18/doc/Muttrc.head.in.orig 2006-08-23 22:29:05.494260250 +0200 ++++ mutt-1.5.18/doc/Muttrc.head 2006-08-23 22:29:30.383815750 +0200 @@ -15,7 +15,7 @@ macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" diff --git a/mutt-pl.po-update.patch b/mutt-pl.po-update.patch index c8d4269..553d4b1 100644 --- a/mutt-pl.po-update.patch +++ b/mutt-pl.po-update.patch @@ -1,61 +1,96 @@ -Only in mutt-1.5.17/po: messages.mo -diff -bur mutt-1.5.17.orig/po/pl.po mutt-1.5.17/po/pl.po ---- mutt-1.5.17.orig/po/pl.po 2007-11-02 14:28:48.370169225 +0100 -+++ mutt-1.5.17/po/pl.po 2007-11-02 14:39:34.134969687 +0100 +--- mutt-1.5.18/po/pl.po.orig 2008-05-17 21:35:34.000000000 +0200 ++++ mutt-1.5.18/po/pl.po 2008-07-25 17:38:44.512753492 +0200 @@ -2,6 +2,8 @@ # Polskie teksty dla Mutta 1.x # 1998-2006 Pawe³ Dziekoñski # 1998-2002 Sergiusz Paw³owicz -+# 2005-2007 Jakub Bogusz ++# 2005-2008 Jakub Bogusz +# 2007 Adam Go³êbiowski # Pre-translation has bean done using PePeSza, # get it from http://home.elka.pw.edu.pl/~pkolodz2/pepesza.html # -@@ -10,12 +12,12 @@ - "Project-Id-Version: mutt-cvs-2007.06.10\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2007-11-01 14:06-0700\n" --"PO-Revision-Date: 2007-06-10 22:37+0200\n" --"Last-Translator: Pawe³ Dziekoñski \n" --"Language-Team: POLISH \n" -+"PO-Revision-Date: 2007-11-02 14:37+0100\n" -+"Last-Translator: Adam Go³êbiowski \n" -+"Language-Team: Polish \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=iso-8859-2\n" --"Content-Transfer-Encoding: 8-bit\n" -+"Content-Transfer-Encoding: 8bit\n" - - #: account.c:164 - #, c-format -@@ -2208,7 +2210,7 @@ - #: init.c:522 - #, c-format - msgid "Not enough subexpressions for spam template" --msgstr "" -+msgstr "Brak wystarczaj±cej liczby podwyra¿eñ dla szablonu spamu" - - #: init.c:748 - msgid "spam: no matching pattern" -@@ -2284,7 +2286,7 @@ - #: init.c:1783 init.c:1795 - #, c-format - msgid "Usage: set variable=yes|no" +@@ -96,18 +98,16 @@ + msgstr "Zapisz do pliku: " + + #: alias.c:345 +-#, fuzzy + msgid "Error reading alias file" +-msgstr "B³±d podczas próby przegl±dania pliku" ++msgstr "B³±d podczas odczytu pliku aliasów" + + #: alias.c:364 + msgid "Alias added." + msgstr "Alias dodany." + + #: alias.c:372 +-#, fuzzy + msgid "Error seeking in alias file" +-msgstr "B³±d podczas próby przegl±dania pliku" ++msgstr "B³±d podczas przemieszczania po pliku aliasów" + + #: attach.c:113 attach.c:245 attach.c:477 attach.c:968 + msgid "Can't match nametemplate, continue?" +@@ -2455,22 +2455,20 @@ + "Aby zg³osiæ b³±d, odwied¼ stronê http://bugs.mutt.org/.\n" + + #: main.c:67 +-#, fuzzy + msgid "" + "Copyright (C) 1996-2008 Michael R. Elkins and others.\n" + "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n" + "Mutt is free software, and you are welcome to redistribute it\n" + "under certain conditions; type `mutt -vv' for details.\n" + msgstr "" +-"Copyright (C) 1996-2007 Michael R. Elkins i inni.\n" ++"Copyright (C) 1996-2008 Michael R. Elkins i inni.\n" + "Program nie jest objêty ¯ADN¡ gwarancj±; szczegó³y poznasz pisz±c 'mutt -" + "vv'.\n" +-"Mutt jest darmowym oprogramowaniem, zapraszamy \n" ++"Mutt jest darmowym oprogramowaniem, zapraszamy\n" + "do jego redystrybucji pod pewnymi warunkami, szczegó³y poznasz pisz±c 'mutt -" + "vv'.\n" + + #: main.c:73 +-#, fuzzy + msgid "" + "Copyright (C) 1996-2007 Michael R. Elkins \n" + "Copyright (C) 1996-2002 Brandon Long \n" +@@ -2483,11 +2481,11 @@ + "Many others not mentioned here contributed code, fixes,\n" + "and suggestions.\n" + msgstr "" +-"Copyright (C) 1996-2006 Michael R. Elkins \n" ++"Copyright (C) 1996-2007 Michael R. Elkins \n" + "Copyright (C) 1996-2002 Brandon Long \n" + "Copyright (C) 1997-2007 Thomas Roessler \n" + "Copyright (C) 1998-2005 Werner Koch \n" +-"Copyright (C) 1999-2007 Brendan Cully \n" ++"Copyright (C) 1999-2008 Brendan Cully \n" + "Copyright (C) 1999-2002 Tommi Komulainen \n" + "Copyright (C) 2000-2002 Edmund Grimley Evans \n" + "\n" +@@ -2654,7 +2652,7 @@ + + #: main.c:831 + msgid "Failed to parse mailto: link\n" -msgstr "" -+msgstr "Sposób u¿ycia: set variable=yes|no" - - #: init.c:1803 - #, c-format -@@ -4086,9 +4088,9 @@ - msgstr "niesparowane nawiasy: %s" - - #: pattern.c:898 --#, fuzzy, c-format -+#, c-format - msgid "%c: invalid pattern modifier" --msgstr "%c: b³êdne polecenie" -+msgstr "%c: b³êdny wzorzec" - - #: pattern.c:904 - #, c-format -Only in mutt-1.5.17/po: pl.po~ ++msgstr "Nie uda³o siê przeanalizowaæ odno¶nika mailto:\n" + + #: main.c:843 + msgid "No recipients specified.\n" +@@ -5001,15 +4999,3 @@ + #: ../keymap_alldefs.h:202 + msgid "show S/MIME options" + msgstr "poka¿ opcje S/MIME" +- +-#~ msgid "SASL failed to get local IP address" +-#~ msgstr "SASL: b³±d pobierania lokalnego adresu IP" +- +-#~ msgid "SASL failed to parse local IP address" +-#~ msgstr "SASL: b³±d przetwarzania lokalnego adresu IP" +- +-#~ msgid "SASL failed to get remote IP address" +-#~ msgstr "SASL: b³±d pobierania zdalnego adresu IP" +- +-#~ msgid "SASL failed to parse remote IP address" +-#~ msgstr "SASL: b³±d zdalnego lokalnego adresu IP" diff --git a/mutt-rr.compressed.patch b/mutt-rr.compressed.patch index aa660d3..ece155e 100644 --- a/mutt-rr.compressed.patch +++ b/mutt-rr.compressed.patch @@ -31,9 +31,8 @@ diff -udprP mutt-1.5.16.orig/Makefile.in mutt-1.5.16/Makefile.in srcdir = @srcdir@ top_srcdir = @top_srcdir@ -diff -udprP mutt-1.5.16.orig/Muttrc.head mutt-1.5.16/Muttrc.head ---- mutt-1.5.16.orig/Muttrc.head 2007-06-06 19:02:56.000000000 +0300 -+++ mutt-1.5.16/Muttrc.head 2007-06-12 14:22:35.000000000 +0300 +--- mutt-1.5.18.orig/doc/Muttrc.head 2007-06-06 19:02:56.000000000 +0300 ++++ mutt-1.5.18/doc/Muttrc.head 2007-06-12 14:22:35.000000000 +0300 @@ -24,6 +24,11 @@ macro generic,pager " macro index,pager y "?" "show incoming mailboxes list" bind browser y exit diff --git a/mutt-send_charset.patch b/mutt-send_charset.patch index 150ee6b..3ee7970 100644 --- a/mutt-send_charset.patch +++ b/mutt-send_charset.patch @@ -1,5 +1,5 @@ ---- mutt-1.4/Muttrc Wed May 29 11:29:44 2002 -+++ Muttrc Sat Aug 31 12:02:41 2002 +--- mutt-1.5.18.orig/doc/Muttrc Wed May 29 11:29:44 2002 ++++ mutt-1.5.18/doc/Muttrc Sat Aug 31 12:02:41 2002 @@ -2733,7 +2733,7 @@ # of this variable will never mark a message read. # diff --git a/mutt-vvv.nntp.patch b/mutt-vvv.nntp.patch index 540e2d9..45a8911 100644 --- a/mutt-vvv.nntp.patch +++ b/mutt-vvv.nntp.patch @@ -410,9 +410,8 @@ diff -udprP mutt-1.5.16.orig/Makefile.in mutt-1.5.16/Makefile.in @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pager.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parse.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patchlist.Po@am__quote@ -diff -udprP mutt-1.5.16.orig/Muttrc mutt-1.5.16/Muttrc ---- mutt-1.5.16.orig/Muttrc 2007-06-10 06:29:25.000000000 +0300 -+++ mutt-1.5.16/Muttrc 2007-06-15 17:12:26.000000000 +0300 +--- mutt-1.5.18.orig/doc/Muttrc 2007-06-10 06:29:25.000000000 +0300 ++++ mutt-1.5.18/doc/Muttrc 2007-06-15 17:12:26.000000000 +0300 @@ -266,6 +266,28 @@ attachments -I message/external-body # if included. # @@ -1553,9 +1552,8 @@ diff -udprP mutt-1.5.16.orig/browser.c mutt-1.5.16/browser.c } } -diff -udprP mutt-1.5.16.orig/browser.h mutt-1.5.16/browser.h ---- mutt-1.5.16.orig/browser.h 2007-04-03 07:57:21.000000000 +0300 -+++ mutt-1.5.16/browser.h 2007-06-15 17:12:26.000000000 +0300 +--- mutt-1.5.18/browser.h.orig 2008-01-30 05:26:49.000000000 +0100 ++++ mutt-1.5.18/browser.h 2008-07-25 17:49:27.844750139 +0200 @@ -20,6 +20,10 @@ #ifndef _BROWSER_H #define _BROWSER_H 1 @@ -1567,7 +1565,7 @@ diff -udprP mutt-1.5.16.orig/browser.h mutt-1.5.16/browser.h struct folder_file { mode_t mode; -@@ -38,14 +42,17 @@ struct folder_file +@@ -38,6 +42,9 @@ unsigned selectable : 1; unsigned inferiors : 1; #endif @@ -1577,16 +1575,6 @@ diff -udprP mutt-1.5.16.orig/browser.h mutt-1.5.16/browser.h unsigned tagged : 1; }; - struct browser_state - { - struct folder_file *entry; -- short entrylen; /* number of real entries */ -- short entrymax; /* max entry */ -+ unsigned int entrylen; /* number of real entries */ -+ unsigned int entrymax; /* max entry */ - #ifdef USE_IMAP - short imap_browse; - char *folder; diff -udprP mutt-1.5.16.orig/buffy.c mutt-1.5.16/buffy.c --- mutt-1.5.16.orig/buffy.c 2007-04-02 00:58:55.000000000 +0300 +++ mutt-1.5.16/buffy.c 2007-06-15 17:12:26.000000000 +0300