[mutt] 02/02: neomutt-devel/832971-reset-xlabel.patch to reset X-Label properly for newer versions of mutt (Closes: 832971).

[Antonio Radici]

This is an automated email from the git hooks/post-receive script.

antonio pushed a commit to branch master
in repository mutt.

commit 8e230452f2bb1bbd0a52265d9d883c932469f48f
Author: Antonio Radici <antonio at debian.org>
Date:   Mon Sep 5 07:22:27 2016 +0100

    neomutt-devel/832971-reset-xlabel.patch to reset X-Label properly for newer versions of mutt (Closes: 832971).
---
 debian/changelog                                       |  2 ++
 debian/patches/neomutt-devel/832971-reset-xlabel.patch | 17 +++++++++++++++++
 debian/patches/series                                  |  1 +
 3 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5b479e4..a1993ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ mutt (1.7.0-2) UNRELEASED; urgency=medium
       length of DSA and Elgamal keys (Closes: 741213).
     + upstream/549204-clear-N-on-readonly-imap-folders.patch: to clear the N
       flag on readonly IMAP mailboxes (Closes: 549204).
+    + neomutt-devel/832971-reset-xlabel.patch to reset X-Label properly for
+      newer versions of mutt (Closes: 832971).
   * debian/extra/rc/notmuch.rc: restored the notmuch keybindings
     (Closes: 836148).
 
diff --git a/debian/patches/neomutt-devel/832971-reset-xlabel.patch b/debian/patches/neomutt-devel/832971-reset-xlabel.patch
new file mode 100644
index 0000000..813140f
--- /dev/null
+++ b/debian/patches/neomutt-devel/832971-reset-xlabel.patch
@@ -0,0 +1,17 @@
+Allow to reset X-Label from mutt 1.6.x onwards.
+Patch provided by Klaus Ethgen <Klaus at Ethgen.de>
+
+Debian bug: http://bugs.debian.org/832971
+
+--- a/copy.c
++++ b/copy.c
+@@ -446,8 +446,7 @@
+       char *tmp = NULL;
+       int fail = 0;
+ 
+-      if (fail == 0 &&
+-          ((h->env->kwtypes & MUTT_X_LABEL) || (h->env->kwtypes == 0)) &&
++      if (((h->env->kwtypes & MUTT_X_LABEL) || (h->env->kwtypes == 0)) &&
+           (option(OPTKEYWORDSLEGACY) || option(OPTKEYWORDSSTANDARD) == 0))
+       {
+         mutt_labels(buf, sizeof(buf), h->env, XlabelDelim);
diff --git a/debian/patches/series b/debian/patches/series
index fe3859f..e1cc0f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 neomutt-20160827.patch
 neomutt-devel/sensible-browser.patch
+neomutt-devel/832971-reset-xlabel.patch
 debian-specific/Muttrc.patch
 debian-specific/Md.etc_mailname_gethostbyname.patch
 debian-specific/use_usr_bin_editor.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mutt/mutt.git