[mutt] 03/03: Remove assumed_charset-compat.patch

[Faidon Liambotis]

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

paravoid pushed a commit to branch master
in repository mutt.

commit 4a4d2c96ac2e204082eb6e886ee6f693ce8f6add
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Mon Jul 25 19:15:07 2016 +0300

    Remove assumed_charset-compat.patch
    
    Remove the assumed_charset-compat.patch and inform users of the renamed
    option ("file_charset" -> "attach_charset") via NEWS.Debian.
---
 debian/NEWS                                        |  3 +++
 debian/changelog                                   |  2 ++
 .../debian-specific/assumed_charset-compat.patch   | 23 ----------------------
 debian/patches/series                              |  1 -
 4 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index 9a666b1..a3c0d31 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -20,6 +20,9 @@ mutt (1.6.2-1) unstable; urgency=medium
     set sidebar_folder_indent=yes
     set sidebar_short_path=yes
 
+  The "file_charset" option has been renamed to "attach_charset", as part of
+  its inclusion upstream.
+
  -- Faidon Liambotis <paravoid at debian.org>  Mon, 25 Jul 2016 18:45:08 +0300
 
 mutt (1.5.21-2) experimental; urgency=low
diff --git a/debian/changelog b/debian/changelog
index 1a2889c..eb65efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ mutt (1.6.2-1) unstable; urgency=medium
   * Update NEWS.Debian and (unfortunately) rewrite history in order to make it
     a little more consistent and easier to read for users upgrading from
     jessie.
+  * Remove the assumed_charset-compat.patch and inform users of the renamed
+    option ("file_charset" -> "attach_charset") via NEWS.Debian.
 
  -- Faidon Liambotis <paravoid at debian.org>  Mon, 25 Jul 2016 18:51:01 +0300
 
diff --git a/debian/patches/debian-specific/assumed_charset-compat.patch b/debian/patches/debian-specific/assumed_charset-compat.patch
deleted file mode 100644
index a4bcf39..0000000
--- a/debian/patches/debian-specific/assumed_charset-compat.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Antonio Radici <antonio at debian.org>
-Date: Thu, 27 Feb 2014 16:20:58 +0100
-Subject: assumed_charset-compat
-
-On upstream inclusion of the assumed_charset patch (past 1.5.14),
-file_charset got renamed to attach_charset. We add it back
-for compatibility.
----
- init.h | 3 +++
- 1 file changed, 3 insertions(+)
-
---- a/init.h
-+++ b/init.h
-@@ -228,6 +228,9 @@ struct option_t MuttVars[] = {
-   ** Note: for Japanese users, ``iso-2022-*'' must be put at the head
-   ** of the value as shown above if included.
-   */
-+  { "file_charset",	DT_SYN,  R_NONE, UL "attach_charset", 0 },
-+  /*
-+  */
-   { "attach_format",	DT_STR,  R_NONE, UL &AttachFormat, UL "%u%D%I %t%4n %T%.40d%> [%.7m/%.10M, %.6e%?C?, %C?, %s] " },
-   /*
-   ** .pp
diff --git a/debian/patches/series b/debian/patches/series
index 6857e86..48c84f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@ debian-specific/use_usr_bin_editor.patch
 debian-specific/correct_docdir_in_man_page.patch
 debian-specific/dont_document_not_present_features.patch
 debian-specific/document_debian_defaults.patch
-debian-specific/assumed_charset-compat.patch
 debian-specific/467432-write_bcc.patch
 debian-specific/566076-build_doc_adjustments.patch
 misc/gpg.rc-paths.patch

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