Uploading to unstable

[software/mutt-debian.git] / debian / patches / features-old / patch-1.5.4.vk.pgp_verbose_mime

diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
index e3989f74027deb9a78cda6e465f3cab8de7064d6..4179485098fc712cb5a89101aea909f849bb31c4 100644 (file)
--- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
+++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
@@ -2,7 +2,7 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
 
 --- a/globals.h
 +++ b/globals.h
 
 --- a/globals.h
 +++ b/globals.h

-@@ -242,6 +242,8 @@
+@@ -243,6 +243,8 @@

  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
  WHERE char *PgpGetkeysCommand;
  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
  WHERE char *PgpGetkeysCommand;


@@ -13,7 +13,7 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
  WHERE char *SmimeDefaultKey;
 --- a/init.h
 +++ b/init.h
  WHERE char *SmimeDefaultKey;
 --- a/init.h
 +++ b/init.h

-@@ -2551,6 +2551,18 @@
+@@ -2556,6 +2556,18 @@

    ** a line quoted text if it also matches $$smileys. This mostly
    ** happens at the beginning of a line.
    */
    ** a line quoted text if it also matches $$smileys. This mostly
    ** happens at the beginning of a line.
    */


@@ -34,8 +34,8 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
  
 --- a/pgp.c
 +++ b/pgp.c
  
 --- a/pgp.c
 +++ b/pgp.c

-@@ -1131,6 +1131,8 @@
-   t->disposition = DISPINLINE;
+@@ -1129,6 +1129,8 @@
+   t->disposition = DISPNONE;

    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */
 +  mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */
 +  mutt_set_parameter ("name", PgpMimeSignatureFilename, &t->parameter);