[mutt] 10/11: Manually resolve some patch fuzz

[Faidon Liambotis]

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

paravoid pushed a commit to branch wip-neomutt
in repository mutt.

commit 48c34230fc830db028ebd33b39a752c56e3a928b
Author: Faidon Liambotis <paravoid at debian.org>
Date:   Wed May 11 02:32:13 2016 +0300

    Manually resolve some patch fuzz
---
 debian/patches/neomutt-devel/sensible-browser.patch | 4 ++--
 debian/patches/neomutt/09-sidebar.patch             | 8 ++++----
 debian/patches/neomutt/14-trash.patch               | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/neomutt-devel/sensible-browser.patch b/debian/patches/neomutt-devel/sensible-browser.patch
index 8e4f549..774ed9a 100644
--- a/debian/patches/neomutt-devel/sensible-browser.patch
+++ b/debian/patches/neomutt-devel/sensible-browser.patch
@@ -19,8 +19,8 @@ index a6121c7..35f6d91 100644
 +++ b/PATCHES
 @@ -1,2 +1,3 @@
 +patch-sensible-browser-neo-UNKNOWN
- patch-trash-neo-UNKNOWN
- patch-ifdef-neo-UNKNOWN
+ patch-trash-neo-20160502
+ patch-ifdef-neo-20160502
 diff --git a/README.sensible-browser b/README.sensible-browser
 new file mode 100644
 index 0000000..adfc076
diff --git a/debian/patches/neomutt/09-sidebar.patch b/debian/patches/neomutt/09-sidebar.patch
index 95ada40..cf1a4ee 100644
--- a/debian/patches/neomutt/09-sidebar.patch
+++ b/debian/patches/neomutt/09-sidebar.patch
@@ -1787,7 +1787,7 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-sidebar/doc/manual.xml.head
 +
  </chapter>
  
- <chapter id="security">
+ <chapter id="optionalfeatures">
 @@ -9237,6 +10317,17 @@
  
  <listitem>
@@ -2721,8 +2721,8 @@ diff -urN mutt-1.6.1/mx.c mutt-1.6.1-sidebar/mx.c
 +#include "sidebar.h"
 +#endif
  
- #ifdef USE_IMAP
- #include "imap.h"
+ #ifdef USE_COMPRESSED
+ #include "compress.h"
 @@ -580,6 +583,7 @@
   *		M_APPEND	open mailbox for appending
   *		M_READONLY	open mailbox in read-only mode
@@ -2774,7 +2774,7 @@ diff -urN mutt-1.6.1/mx.c mutt-1.6.1-sidebar/mx.c
 +#endif
    FREE (&ctx->hdrs);
    FREE (&ctx->v2r);
-   FREE (&ctx->path);
+ #ifdef USE_COMPRESSED
 @@ -812,6 +837,12 @@
      if (!ctx->hdrs[i]->deleted && ctx->hdrs[i]->read 
          && !(ctx->hdrs[i]->flagged && option (OPTKEEPFLAGGED)))
diff --git a/debian/patches/neomutt/14-trash.patch b/debian/patches/neomutt/14-trash.patch
index 4b25200..e34f07b 100644
--- a/debian/patches/neomutt/14-trash.patch
+++ b/debian/patches/neomutt/14-trash.patch
@@ -69,7 +69,7 @@ diff -urN mutt-1.6.1/doc/manual.xml.head mutt-1.6.1-trash/doc/manual.xml.head
 --- mutt-1.6.1/doc/manual.xml.head	2016-05-02 03:02:12.402171465 +0100
 +++ mutt-1.6.1-trash/doc/manual.xml.head	2016-05-02 03:02:15.955227994 +0100
 @@ -8081,6 +8081,175 @@
- 
+ 	</sect2>
  </sect1>
  
 +<sect1 id="trash-folder">

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