← Back to branch summary

~ubuntu-dev/ubuntu/lucid/mutt/lucid-201002110857

« back to all changes in this revision

Viewing changes to debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime

  • Committer: Bazaar Package Importer
  • Author(s): أحمد المحمودي (Ahmed El-Mahmoudy)
  • Date: 2009-06-17 17:17:28 UTC
  • mfrom: (1.1.11 upstream) (16.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20090617171728-lj10l5x2m2vg6cag
Tags: 1.5.20-1ubuntu1
https://launchpad.net/bugs/388515
https://launchpad.net/bugs/386308
* Merge from debian unstable (LP: #388515)
* Build-depend on elinks-lite
  + elinks-lite doesn't provide links anymore.
  + elinks-lite is now in main, and pulls less dependencies than the
    full-fledged elinks.
* debian/control: Recommend default-mta instead of exim4. (LP: #386308)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
2
2
 
3
3
--- a/globals.h
4
4
+++ b/globals.h
5
 
@@ -241,6 +241,8 @@
 
5
@@ -242,6 +242,8 @@
6
6
 WHERE char *PgpListSecringCommand;
7
7
 WHERE char *PgpListPubringCommand;
8
8
 WHERE char *PgpGetkeysCommand;
13
13
 WHERE char *SmimeDefaultKey;
14
14
--- a/init.h
15
15
+++ b/init.h
16
 
@@ -1790,6 +1790,18 @@
17
 
   ** checked with the \fC$<check-traditional-pgp>\fP function, mutt will automatically
18
 
   ** check the message for traditional pgp.
 
16
@@ -2551,6 +2551,18 @@
 
17
   ** a line quoted text if it also matches $$smileys. This mostly
 
18
   ** happens at the beginning of a line.
19
19
   */
20
20
+  { "pgp_mime_signature_filename", DT_STR, R_NONE, UL &PgpMimeSignatureFilename, UL "signature.asc"},
21
21
+  /*
30
30
+  ** PGP/MIME signed messages.
31
31
+  */
32
32
 
33
 
   /* XXX Default values! */
 
33
 
34
34
 
35
35
--- a/pgp.c
36
36
+++ b/pgp.c
37
 
@@ -1113,6 +1113,8 @@
 
37
@@ -1131,6 +1131,8 @@
38
38
   t->disposition = DISPINLINE;
39
39
   t->encoding = ENC7BIT;
40
40
   t->unlink = 1; /* ok to remove this file after sending. */