[mutt] 03/04: neomutt-devel/832971-reset-xlabel.patch removed, already upstream.

[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 b97c7dbb5c2af580cd65b5030826762729f4e014
Author: Antonio Radici <antonio at debian.org>
Date:   Tue Mar 14 21:40:16 2017 +0000

    neomutt-devel/832971-reset-xlabel.patch removed, already upstream.
---
 debian/changelog                                       |  2 ++
 debian/patches/neomutt-devel/832971-reset-xlabel.patch | 17 -----------------
 debian/patches/series                                  |  1 -
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a0e087d..5c12473 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mutt (1.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream Mutt relaese.
   * New upstream NeoMutt release, 2017-03-06 (Closes: 857687)
+  * debian/patches:
+    + neomutt-devel/832971-reset-xlabel.patch removed, already upstream.
 
  -- Antonio Radici <antonio at debian.org>  Tue, 14 Mar 2017 21:30:19 +0000
 
diff --git a/debian/patches/neomutt-devel/832971-reset-xlabel.patch b/debian/patches/neomutt-devel/832971-reset-xlabel.patch
deleted file mode 100644
index 2c323fe..0000000
--- a/debian/patches/neomutt-devel/832971-reset-xlabel.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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
-@@ -460,8 +460,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 57401ab..21ba19d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 neomutt-20170306.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