overriden/overridden, again

[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 de5a7acd8ad9fd9fc2631d1759b8023019492b9e..cb91b5fd7ef31c9696e1f2db209aab0d2c722a61 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
@@ -1,8 +1,10 @@
 Enable pgp_mime_signature_filename and pgp_mime_signature_description
 
---- a/globals.h
-+++ b/globals.h
-@@ -241,6 +241,8 @@
+Index: mutt/globals.h
+===================================================================
+--- mutt.orig/globals.h        2009-06-25 12:35:48.000000000 +0200
++++ mutt/globals.h     2009-06-25 12:36:22.000000000 +0200
+@@ -242,6 +242,8 @@
  WHERE char *PgpListSecringCommand;
  WHERE char *PgpListPubringCommand;
  WHERE char *PgpGetkeysCommand;
@@ -11,11 +13,13 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
  
  /*-- formerly in smime.h --*/
  WHERE char *SmimeDefaultKey;
---- a/init.h
-+++ b/init.h
-@@ -1790,6 +1790,18 @@
-   ** checked with the \fC$<check-traditional-pgp>\fP function, mutt will automatically
-   ** check the message for traditional pgp.
+Index: mutt/init.h
+===================================================================
+--- mutt.orig/init.h   2009-06-25 12:35:48.000000000 +0200
++++ mutt/init.h        2009-06-25 12:36:22.000000000 +0200
+@@ -2541,6 +2541,18 @@
+   ** a line quoted text if it also matches $$smileys. This mostly
+   ** happens at the beginning of a line.
    */
 +  { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
 +  /*
@@ -30,11 +34,13 @@ Enable pgp_mime_signature_filename and pgp_mime_signature_description
 +  ** PGP/MIME signed messages.
 +  */
  
-   /* XXX Default values! */
  
---- a/pgp.c
-+++ b/pgp.c
-@@ -1113,6 +1113,8 @@
+ 
+Index: mutt/pgp.c
+===================================================================
+--- mutt.orig/pgp.c    2009-06-25 12:35:36.000000000 +0200
++++ mutt/pgp.c 2009-06-25 12:36:22.000000000 +0200
+@@ -1131,6 +1131,8 @@
    t->disposition = DISPINLINE;
    t->encoding = ENC7BIT;
    t->unlink = 1; /* ok to remove this file after sending. */