do not store the color in header cache (Closes: 545316), preserve the References...

  + upstream/545316-header-color.patch: do not store the color in header cache
    (Closes: 545316)
  + upstream/568295-references.patch: preserve the References header if the
    In-Reply-To is not initially present (Closes: 568295)

diff --git a/debian/changelog b/debian/changelog
index f7f9c70b55e38c6c518c0f474abac4742404dc85..02b4ff1f26b3ff74c5cc8997b11b4a5277045742 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,10 @@ mutt (1.5.20-7) unstable; urgency=low
       with large ASCII escape sequences (Closes: 553321)
     + upstream/557395-muttrc-crypto.patch: small fix to the muttrc man 
       (Closes: 557395)
-    + debian/patches/upstream/545316-header-color.patch: do not store the color
-      in header cache (Closes: 545316)
+    + upstream/545316-header-color.patch: do not store the color in header cache
+      (Closes: 545316)
+    + upstream/568295-references.patch: preserve the References header if the
+      In-Reply-To is not initially present (Closes: 568295)
     + debian-specific/Muttrc: set time_inc to be 250ms (Closes: 537746)
   * debian/control: 
     + bumping Standards-Version to 3.8.4, nothing to be done

diff --git a/debian/patches/series b/debian/patches/series
index b9b67cbf7a7a25f0bc238577e00e33ca3ece1232..8f1ad7ed71a7a026fc240e88084dc4cd08fda194 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -55,6 +55,7 @@ upstream/553321-ansi-escape-segfault.patch
 upstream/553238-german-intl.patch
 upstream/557395-muttrc-crypto.patch
 upstream/545316-header-color.patch
+upstream/568295-references.patch
 
 misc/hyphen-as-minus.patch
 #misc/manpage-typos.patch

diff --git a/debian/patches/upstream/568295-references.patch b/debian/patches/upstream/568295-references.patch
new file mode 100644 (file)
index 0000000..14ac88e
--- /dev/null
+++ b/debian/patches/upstream/568295-references.patch
@@ -0,0 +1,17 @@
+The purpose of this patch is to preserve the References header if the
+In-Reply-To header is not initially present; forwarded upstream to
+http://bugs.mutt.org/3378
+
+--- a/headers.c
++++ b/headers.c
+@@ -114,8 +114,8 @@
+      $edit_headers set, we remove References: as they're likely invalid;
+      we can simply compare strings as we don't generate References for
+      multiple Message-Ids in IRT anyways */
+-  if (!n->in_reply_to || (msg->env->in_reply_to &&
+-                        mutt_strcmp (n->in_reply_to->data,
++  if (msg->env->in_reply_to &&
++     (!n->in_reply_to || mutt_strcmp (n->in_reply_to->data,
+                                      msg->env->in_reply_to->data) != 0))
+     mutt_free_list (&msg->env->references);
+