From 3b611f977933829fa92757a08e502fbe339a52c6 Mon Sep 17 00:00:00 2001 From: Antonio Radici Date: Wed, 16 Sep 2009 22:32:16 +0100 Subject: [PATCH] + upstream/533370-pgp-inline.patch: fixing the patch from 1.5.20-3, now pgp.c is correctly included (Closes: 533370) --- debian/changelog | 8 ++++++++ .../patches/upstream/533370-pgp-inline.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/debian/changelog b/debian/changelog index 1a298b3..ff30f9f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mutt (1.5.20-5) unstable; urgency=low + + * debian/patches: + + upstream/533370-pgp-inline.patch: fixing the patch from 1.5.20-3, now + pgp.c is correctly included (Closes: 533370) + + -- Antonio Radici Wed, 16 Sep 2009 22:31:22 +0100 + mutt (1.5.20-4) unstable; urgency=low * Backing out the broken mutt-patched/sidebar-newonly patch diff --git a/debian/patches/upstream/533370-pgp-inline.patch b/debian/patches/upstream/533370-pgp-inline.patch index a928e7a..da37b35 100644 --- a/debian/patches/upstream/533370-pgp-inline.patch +++ b/debian/patches/upstream/533370-pgp-inline.patch @@ -21,3 +21,21 @@ upstream http://bugs.mutt.org/3269 } m->goodsig = (maybe_goodsig && have_any_sigs); +--- a/pgp.c ++++ b/pgp.c +@@ -482,7 +482,6 @@ + state_attach_puts (_("[-- END PGP SIGNED MESSAGE --]\n"), s); + } + } +-#if 0 + else + { + /* why would we want to display this at all? */ +@@ -491,7 +490,6 @@ + state_puts (s->prefix, s); + state_puts (buf, s); + } +-#endif + } + + rc = 0; -- 2.43.0