From aaf90aa762383ca20a486092ad36eef6f482210b Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Thu, 10 Sep 2009 23:49:45 +0100 Subject: [PATCH 1/1] features/ifdef: fixed a typo (Closes: 539974), debian-specific/Muttrc: correctly state that exim4 does not strip Bcc: headers (Closes: 474194), upstream/533520-signature-highlight.patch: fixed a problem in signature hightlighting if text_flowed was set to 'yes' (Closes: 533520) + features/ifdef: fixed a typo (Closes: 539974) + debian-specific/Muttrc: correctly state that exim4 does not strip Bcc: headers (Closes: 474194) + upstream/533520-signature-highlight.patch: fixed a problem in signature hightlighting if text_flowed was set to 'yes' (Closes: 533520) --- debian/changelog | 8 +++++--- debian/patches/series | 3 +++ .../upstream/533520-signature-highlight.patch | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 debian/patches/upstream/533520-signature-highlight.patch diff --git a/debian/changelog b/debian/changelog index 2ebdd29..36aed2c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,19 +5,21 @@ mutt (1.5.20-3) UNRELEASED; urgency=low [ Antonio Radici ] * debian/patches: + + features/ifdef: fixed a typo (Closes: 539974) + + debian-specific/Muttrc: correctly state that exim4 does not strip Bcc: + headers (Closes: 474194) + upstream/538128-mh-folder-access.patch: MH dirs are now correctly parsed (Closes: 538128) + upstream/537818-emptycharset.patch: handling empty charsets without segfaulting (Closes: 537818) + upstream/535096-pop-port.patch: allow a user to specify a port for a pop connection, as it was before 1.5.20 (Closes: 535096) - + debian-specific/Muttrc: correctly state that exim4 does not strip Bcc: - headers (Closes: 474194) + upstream/542910-search-segfault.patch: fixes a bug in search which caused a segfault (Closes: 542910) + upstream/533370-pgp-inline.patch: inline pgp messages now displayed correctly even if pgp_auto_decode is set (Closes: 533370) - + features/ifdef: fixed a typo (Closes: 539974) + + upstream/533520-signature-highlight.patch: fixed a problem in signature + hightlighting if text_flowed was set to 'yes' (Closes: 533520) * debian/control: + Standards-Version bumped to 3.8.3 * debian/extra/lib/mailto-mutt: patch from madduck@ to correctly handle the diff --git a/debian/patches/series b/debian/patches/series index f2607e8..bcbefad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -39,6 +39,9 @@ upstream/534543-imap-port.patch upstream/538128-mh-folder-access.patch upstream/537818-emptycharset.patch upstream/535096-pop-port.patch +upstream/542910-search-segfault.patch +upstream/533370-pgp-inline.patch +upstream/533520-signature-highlight.patch misc/hyphen-as-minus.patch #misc/manpage-typos.patch misc/smime_keys-manpage.patch diff --git a/debian/patches/upstream/533520-signature-highlight.patch b/debian/patches/upstream/533520-signature-highlight.patch new file mode 100644 index 0000000..c2bc2b8 --- /dev/null +++ b/debian/patches/upstream/533520-signature-highlight.patch @@ -0,0 +1,14 @@ +before this patch mutt failed to highlight some signatures if text_flowed was +set to yes (see upstream http://bugs.mutt.org/3275) + +--- a/handler.c ++++ b/handler.c +@@ -1500,7 +1500,7 @@ + l = mutt_strlen (buf); + if (l > 0 && buf[l-1] == '\n') + buf[--l] = 0; +- if (option (OPTTEXTFLOWED)) ++ if (mutt_strcmp (buf, "-- ") != 0 && option (OPTTEXTFLOWED)) + { + while (l > 0 && buf[l-1] == ' ') + buf[--l] = 0; -- 2.43.0