[mutt] 07/17: upstream/611410-no-implicit_autoview-for-text-html.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 beeddffdcf9bdd34a461e04c76b18618581e6c49
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Jun 24 10:22:18 2017 +0100

    upstream/611410-no-implicit_autoview-for-text-html.patch removed, already upstream.
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 -
 ...611410-no-implicit_autoview-for-text-html.patch | 34 ----------------------
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9fbf5d9..58bc906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ mutt (1.8.3+20170609-1) UNRELEASED; urgency=medium
     + debian-specific/467432-write_bcc.patch refreshed.
     + upstream/228671-pipe-mime.patch removed, already upstream
       (Closes: 860176).
+    + upstream/611410-no-implicit_autoview-for-text-html.patch removed,
+      already upstream.
     + general patch refresh where applicable.
 
  -- Antonio Radici <antonio at debian.org>  Sat, 24 Jun 2017 09:32:46 +0100
diff --git a/debian/patches/series b/debian/patches/series
index 658621e..f73516a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,7 +11,6 @@ misc/smime.rc.patch
 upstream/528233-readonly-open.patch
 upstream/383769-score-match.patch
 upstream/771125-CVE-2014-9116-jessie.patch
-upstream/611410-no-implicit_autoview-for-text-html.patch
 upstream/693993-manpage-corrections.patch
 upstream/749483-conststrings.patch
 upstream/644992-ipv6-literal.patch
diff --git a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch b/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
deleted file mode 100644
index b5fdd72..0000000
--- a/debian/patches/upstream/611410-no-implicit_autoview-for-text-html.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-This patch blacklist text/html from the list of documents that will be
-shown automatically, the patch (the muttlib.c part) has been written by
-Loïc Minier <lool at dooz.org>, I've added the documentation bit.
-
-The patch has been forwarded upstream originally by Loïc on:
-http://bugs.mutt.org/3496.
-
-The original Debian bug for this problem is http://bugs.debian.org/611410
-
---- a/init.h
-+++ b/init.h
-@@ -1435,7 +1435,9 @@
-   ** ``\fCcopiousoutput\fP'' flag set for \fIevery\fP MIME attachment it doesn't have
-   ** an internal viewer defined for.  If such an entry is found, mutt will
-   ** use the viewer defined in that entry to convert the body part to text
--  ** form.
-+  ** form. MIME attachments with 'text' types, with the only exception
-+  ** of text/html, are excluded: they will be shown as they are unless auto_view
-+  ** is specified.
-   */
-   { "include",		DT_QUAD, R_NONE, OPT_INCLUDE, MUTT_ASKYES },
-   /*
---- a/muttlib.c
-+++ b/muttlib.c
-@@ -734,6 +734,9 @@
-   switch (m->type)
-   {
-     case TYPETEXT:
-+      /* we don't want to display text/html */
-+      if (!ascii_strcasecmp ("html", m->subtype))
-+        return 1;
-       /* we can display any text, overridable by auto_view */
-       return 0;
-       break;

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