+ upstream/533370-pgp-inline.patch: fixing the patch from 1.5.20-3, now pgp.c is...

diff --git a/debian/changelog b/debian/changelog
index 1a298b3e363fd976bbcca7a47507f7eb3aa675b0..ff30f9f96dc281ab10fc44b449270d89c07dee5f 100644 (file)
--- 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 <antonio@dyne.org>  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 a928e7a98c5863c3e62df7b0953b33c2dcf8aee8..da37b358b064e0089a0a5af8743fdaae0c7ec994 100644 (file)
--- 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;