[mutt] 04/04: Ship our patched Muttrc

[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 5d5d42a2777d2968305117eda777100181c32cdb
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Tue Jul 12 15:19:29 2016 +0300

    Ship our patched Muttrc
    
    Fixes a 1.6.1-2 regression.
    
    Closes: #830692, #830695
---
 debian/changelog                            |  2 ++
 debian/patches/debian-specific/Muttrc.patch | 22 ++++++++++++----------
 debian/rules                                |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4bf8c71..4296a28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 mutt (1.6.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Ship our patched Muttrc instead of the stock, non-generated Muttrc,
+    something that regressed with 1.6.1-2. (Closes: #830692, #830695)
 
  -- Faidon Liambotis <paravoid at debian.org>  Tue, 12 Jul 2016 15:12:09 +0300
 
diff --git a/debian/patches/debian-specific/Muttrc.patch b/debian/patches/debian-specific/Muttrc.patch
index aee3d06..88e2ef4 100644
--- a/debian/patches/debian-specific/Muttrc.patch
+++ b/debian/patches/debian-specific/Muttrc.patch
@@ -10,11 +10,9 @@ Signed-off-by: Matteo F. Vescovi <mfvescovi at gmail.com>
  doc/Muttrc.head | 36 ++++++++++++++++++++++++++++++++++--
  1 file changed, 34 insertions(+), 2 deletions(-)
 
-diff --git a/doc/Muttrc.head b/doc/Muttrc.head
-index 1f7012e..477c4b6 100644
 --- a/doc/Muttrc.head
 +++ b/doc/Muttrc.head
-@@ -12,6 +12,34 @@ unignore from: subject to cc date x-mailer x-url user-agent
+@@ -12,6 +12,34 @@ unignore from: subject to cc date x-mail
  # Display the fields in this order
  hdr_order date from to cc subject
  
@@ -49,25 +47,29 @@ index 1f7012e..477c4b6 100644
  # imitate the old search-body function
  macro index \eb "<search>~b " "search in message bodies"
  
-@@ -23,7 +51,7 @@ macro index,pager,attach,compose \cb "\
+@@ -23,19 +51,14 @@ macro index,pager,attach,compose \cb "\
  "call urlview to extract URLs out of a message"
  
  # Show documentation when pressing F1
 -macro generic,pager <F1> "<shell-escape> less @docdir@/manual.txt<Enter>" "show Mutt documentation"
-+macro generic,pager <F1> "<shell-escape> zcat @docdir@/mutt/manual.txt.gz | sensible-pager<enter>" "show Mutt documentation"
++macro generic,pager <F1> "<shell-escape> zcat @docdir@/manual.txt.gz | sensible-pager<enter>" "show Mutt documentation"
  
  # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y"
  macro index,pager y "<change-folder>?<toggle-mailboxes>" "show incoming mailboxes list"
-@@ -35,7 +63,7 @@ bind browser y exit
- # append-hook \\.gz$ "gzip -c %t >> %f"
-
+ bind browser y exit
+ 
+-# Use folders which match on \\.gz$ as gzipped folders:
+-# open-hook \\.gz$ "gzip -cd %f > %t"
+-# close-hook \\.gz$ "gzip -c %t > %f"
+-# append-hook \\.gz$ "gzip -c %t >> %f"
+-
  # If Mutt is unable to determine your site's domain name correctly, you can
 -# set the default here.
 +# set the default here. (better: fix /etc/mailname)
  #
  # set hostname=cs.hmc.edu
-
-@@ -47,6 +75,10 @@ bind browser y exit
+ 
+@@ -47,6 +70,10 @@ bind browser y exit
  # be undone with unmime_lookup.
  mime_lookup application/octet-stream
  
diff --git a/debian/rules b/debian/rules
index f9b48fe..c11e9d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,7 +45,7 @@ override_dh_install:
 	
 	chmod +x debian/extra/lib/*
 	
-	( sed -e '/## More settings/,$$d' $(CURDIR)/doc/Muttrc || exit 1 ; \
+	( sed -e '/## More settings/,$$d' debian/tmp/etc/Muttrc || exit 1 ; \
 	  cat debian/extra/rc/Muttrc.foot ) > debian/tmp/Muttrc
 	
 	dh_install

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