[mutt] 04/05: patches refreshed

[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 b29c76c52945b1d8ca088973bd19e88b76b0a1c0
Author: Antonio Radici <antonio at debian.org>
Date:   Sat Jan 27 21:13:31 2018 +0000

    patches refreshed
---
 .../566076-build_doc_adjustments.patch             |  4 ++--
 .../patches/upstream/fast-imap-flag-handling.patch | 25 ++++++++++------------
 debian/patches/upstream/imap-poll-timeout.patch    |  7 +++---
 3 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/debian/patches/debian-specific/566076-build_doc_adjustments.patch b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
index 337a984..72daa33 100644
--- a/debian/patches/debian-specific/566076-build_doc_adjustments.patch
+++ b/debian/patches/debian-specific/566076-build_doc_adjustments.patch
@@ -9,7 +9,7 @@ Use w3m to build the txt manual.
 
 --- a/doc/Makefile.am
 +++ b/doc/Makefile.am
-@@ -109,9 +109,7 @@
+@@ -106,9 +106,7 @@
  
  check:
  manual.txt: manual.html
@@ -20,7 +20,7 @@ Use w3m to build the txt manual.
  
  Muttrc: stamp-doc-rc
  
-@@ -123,7 +121,7 @@
+@@ -120,7 +118,7 @@
  	touch stamp-doc-rc
  
  manual.html: $(srcdir)/html.xsl $(srcdir)/mutt.xsl stamp-doc-xml $(srcdir)/mutt.css
diff --git a/debian/patches/upstream/fast-imap-flag-handling.patch b/debian/patches/upstream/fast-imap-flag-handling.patch
index 3d59bec..3bb1409 100644
--- a/debian/patches/upstream/fast-imap-flag-handling.patch
+++ b/debian/patches/upstream/fast-imap-flag-handling.patch
@@ -21,10 +21,9 @@ header flag change.  Only set one of the reopen/check_status flags in
 the event of an actual change (or potential change if a local change
 has been made to the header.)
 
-diff -r cbe207b97a2a -r e98ad5446640 imap/command.c
---- a/imap/command.c	Tue Sep 26 19:45:23 2017 -0700
-+++ b/imap/command.c	Wed Sep 27 13:45:36 2017 -0700
-@@ -652,6 +652,7 @@
+--- a/imap/command.c
++++ b/imap/command.c
+@@ -653,6 +653,7 @@
  {
    unsigned int msn, uid;
    HEADER *h;
@@ -32,7 +31,7 @@ diff -r cbe207b97a2a -r e98ad5446640 imap/command.c
  
    dprint (3, (debugfile, "Handling FETCH\n"));
  
-@@ -687,13 +688,14 @@
+@@ -688,13 +689,14 @@
  
      if (ascii_strncasecmp ("FLAGS", s, 5) == 0)
      {
@@ -53,9 +52,8 @@ diff -r cbe207b97a2a -r e98ad5446640 imap/command.c
        }
        return;
      }
-diff -r cbe207b97a2a -r e98ad5446640 imap/imap_private.h
---- a/imap/imap_private.h	Tue Sep 26 19:45:23 2017 -0700
-+++ b/imap/imap_private.h	Wed Sep 27 13:45:36 2017 -0700
+--- a/imap/imap_private.h
++++ b/imap/imap_private.h
 @@ -269,7 +269,7 @@
  void imap_add_keywords (char* s, HEADER* keywords, LIST* mailbox_flags, size_t slen);
  void imap_free_header_data (IMAP_HEADER_DATA** data);
@@ -65,10 +63,9 @@ diff -r cbe207b97a2a -r e98ad5446640 imap/imap_private.h
  int imap_cache_del (IMAP_DATA* idata, HEADER* h);
  int imap_cache_clean (IMAP_DATA* idata);
  
-diff -r cbe207b97a2a -r e98ad5446640 imap/message.c
---- a/imap/message.c	Tue Sep 26 19:45:23 2017 -0700
-+++ b/imap/message.c	Wed Sep 27 13:45:36 2017 -0700
-@@ -652,7 +652,7 @@
+--- a/imap/message.c
++++ b/imap/message.c
+@@ -653,7 +653,7 @@
  	 * incrementally update flags later, this won't stop us syncing */
  	else if ((ascii_strncasecmp ("FLAGS", pc, 5) == 0) && !h->changed)
  	{
@@ -77,7 +74,7 @@ diff -r cbe207b97a2a -r e98ad5446640 imap/message.c
  	    goto bail;
  	}
        }
-@@ -1183,19 +1183,55 @@
+@@ -1184,19 +1184,55 @@
    }
  }
  
@@ -135,7 +132,7 @@ diff -r cbe207b97a2a -r e98ad5446640 imap/message.c
    dprint (2, (debugfile, "imap_set_flags: parsing FLAGS\n"));
    if ((s = msg_parse_flags (&newh, s)) == NULL)
      return NULL;
-@@ -1207,16 +1243,24 @@
+@@ -1208,16 +1244,24 @@
    readonly = ctx->readonly;
    ctx->readonly = 0;
  
diff --git a/debian/patches/upstream/imap-poll-timeout.patch b/debian/patches/upstream/imap-poll-timeout.patch
index 9a54622..3e5c446 100644
--- a/debian/patches/upstream/imap-poll-timeout.patch
+++ b/debian/patches/upstream/imap-poll-timeout.patch
@@ -9,10 +9,9 @@ Add polling for the IDLE command. (closes #3957)
 Add $imap_poll_timeout poll for IDLE, since this is also a command
 that will freeze after waking if $imap_idle is set.
 
-diff -r ba4a3cb944c5 -r 321805c70d99 imap/command.c
---- a/imap/command.c	Sat Sep 30 19:16:56 2017 -0700
-+++ b/imap/command.c	Sun Oct 15 15:13:18 2017 +0800
-@@ -333,7 +333,21 @@
+--- a/imap/command.c
++++ b/imap/command.c
+@@ -334,7 +334,21 @@
  {
    int rc;
  

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