Pull patch from upstream to fix multipart decoding. (Closes: #489283)

[software/mutt-debian.git] / debian / patches / debian-specific / dont_document_not_present_features.diff

diff --git a/debian/patches/debian-specific/dont_document_not_present_features.diff b/debian/patches/debian-specific/dont_document_not_present_features.diff
index b1f0e905b28c7ffd88cd6d0bdbd73c0990a84ab2..59844ee269fb38ccbdbf467b19bc29e331f1bb1d 100644 (file)
--- a/debian/patches/debian-specific/dont_document_not_present_features.diff
+++ b/debian/patches/debian-specific/dont_document_not_present_features.diff
@@ -1,23 +1,22 @@
---- mutt-1.5.11.orig/init.h
-+++ mutt-1.5.11/init.h
-@@ -80,9 +80,9 @@
- #define ISPELL "ispell"
+--- a/init.h
++++ b/init.h
+@@ -19,7 +19,7 @@
+ 
+ #ifdef _MAKEDOC
+ # include "config.h"
+-# include "doc/makedoc-defs.h"
++/* # include "makedoc-defs.h" include only documented options for Debian */
+ #else
+ # include "sort.h"
  #endif
+--- a/functions.h
++++ b/functions.h
+@@ -35,7 +35,7 @@
  
--/* build complete documentation */
-+/* Disable "build complete documentation" for Debian */
+ #ifdef _MAKEDOC
+ # include "config.h"
+-# include "doc/makedoc-defs.h"
++/* # include "doc/makedoc-defs.h" include only documented options for Debian */
+ #endif
  
--#ifdef _MAKEDOC
-+#if 0
- # ifndef USE_IMAP
- #  define USE_IMAP
- # endif
-@@ -2007,7 +2007,7 @@
-   ** .pp
-   ** Example: set certificate_file=~/.mutt/certificates
-   */
--# if defined _MAKEDOC || !defined(USE_GNUTLS)
-+# ifndef USE_GNUTLS
-   { "ssl_usesystemcerts", DT_BOOL, R_NONE, OPTSSLSYSTEMCERTS, 1 },
-   /*
-   ** .pp
+ struct binding_t OpGeneric[] = { /* map: generic */