[mutt] 01/01: Disable the sidebar by default

[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 62668aec7b1ae44d1a8fd21d13a83e8a31196d41
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Mon Jul 25 19:57:59 2016 +0300

    Disable the sidebar by default
    
    Remove the /etc/Muttrc.d/sidebar.rc conffile which enabled sidebar by
    default. Sidebar is now OFF by default, in order to stick with
    upstream's defaults and what most mutt users expect. Document this in
    NEWS.Debian.
---
 debian/NEWS                | 7 +++++--
 debian/changelog           | 3 +++
 debian/extra/rc/sidebar.rc | 4 ----
 debian/mutt.maintscript    | 1 +
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/NEWS b/debian/NEWS
index a3c0d31..c973ca6 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -10,10 +10,13 @@ mutt (1.6.2-1) unstable; urgency=medium
   http://www.neomutt.org/
 
   The sidebar patch has been polished up and merged upstream in what will
-  eventually be Mutt 1.7.0. NeoMutt incorporates the new version, which among
-  other changes includes renamed configuration options. To keep the old
+  eventually be Mutt 1.7.0 -- and then backported again by NeoMutt. For
+  compatibility with upstream's default and since there is no mutt-patched
+  package anymore, the sidebar is now off by default. Moreover, this new
+  version renamed the sidebar's configuration options. To keep the old
   behavior, use this in your .muttrc:
     set mail_check_stats=yes
+    set sidebar_visible=yes
     set sidebar_format="%B%*  %S%?N?(%N)?%?F?[%F]?"
     set sidebar_indent_string=" "
   and optionally:
diff --git a/debian/changelog b/debian/changelog
index eb65efd..cc41595 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ mutt (1.6.2-1) unstable; urgency=medium
     jessie.
   * Remove the assumed_charset-compat.patch and inform users of the renamed
     option ("file_charset" -> "attach_charset") via NEWS.Debian.
+  * Remove the /etc/Muttrc.d/sidebar.rc conffile which enabled sidebar by
+    default. Sidebar is now OFF by default, in order to stick with upstream's
+    defaults and what most mutt users expect. Document this in NEWS.Debian.
 
  -- Faidon Liambotis <paravoid at debian.org>  Mon, 25 Jul 2016 18:51:01 +0300
 
diff --git a/debian/extra/rc/sidebar.rc b/debian/extra/rc/sidebar.rc
deleted file mode 100644
index fb7de56..0000000
--- a/debian/extra/rc/sidebar.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-# Configuration for the sidebar.
-
-ifdef sidebar_visible set sidebar_visible sidebar_width=20
-
diff --git a/debian/mutt.maintscript b/debian/mutt.maintscript
new file mode 100644
index 0000000..1fa14d3
--- /dev/null
+++ b/debian/mutt.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/Muttrc.d/sidebar.rc 1.6.2-1~ mutt

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