On Thu, Sep 05, 2013 at 09:31:40AM +0800, Chow Loong Jin wrote: > tags 721860 + pending > thanks > > Dear maintainer, > > I've prepared an NMU for mutt (versioned as 1.5.21-6.3) and > uploaded it to DELAYED/10. Please feel free to tell me if I > should delay it longer.
Just realized that I added my changes on top of the wrong version. Here's an updated diff. -- Kind regards, Loong Jin
diff --git a/debian/changelog b/debian/changelog index 264b0c4..7aaf138 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +mutt (1.5.21-6.4) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/features/imap_fast_trash: Don't send saved messages to trash + (Closes: #721860) + + -- Chow Loong Jin <[email protected]> Wed, 04 Sep 2013 17:57:52 +0800 + mutt (1.5.21-6.3) unstable; urgency=low * Build-Depend on libtool, as used by autoreconf. diff --git a/debian/patches/features/imap_fast_trash b/debian/patches/features/imap_fast_trash index b335bd9..5d638a8 100644 --- a/debian/patches/features/imap_fast_trash +++ b/debian/patches/features/imap_fast_trash @@ -4,9 +4,14 @@ Make "move to trash folder" use IMAP COPY. by Paul Miller (jettero) ---- a/imap/imap.c -+++ b/imap/imap.c -@@ -893,6 +893,12 @@ static int imap_make_msg_set (IMAP_DATA* +* Changes made: + - Properly handle appended attribute when sending things to trash (Don't send + saved messages to trash) +Index: mutt/imap/imap.c +=================================================================== +--- mutt.orig/imap/imap.c 2013-09-04 18:24:53.034597181 +0800 ++++ mutt/imap/imap.c 2013-09-04 18:29:42.333245990 +0800 +@@ -893,6 +893,12 @@ if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted) match = invert ^ hdrs[n]->deleted; break; @@ -14,12 +19,12 @@ by Paul Miller (jettero) + if (hdrs[n]->purged) + break; + if (hdrs[n]->deleted != HEADER_DATA(hdrs[n])->deleted) -+ match = invert ^ hdrs[n]->deleted; ++ match = invert ^ (hdrs[n]->deleted && !hdrs[n]->appended); + break; case M_FLAG: if (hdrs[n]->flagged != HEADER_DATA(hdrs[n])->flagged) match = invert ^ hdrs[n]->flagged; -@@ -2028,3 +2034,54 @@ int imap_complete(char* dest, size_t dle +@@ -2028,3 +2034,54 @@ return -1; } @@ -74,9 +79,11 @@ by Paul Miller (jettero) + + return 1; +} ---- a/imap/imap.h -+++ b/imap/imap.h -@@ -72,4 +72,7 @@ void imap_keepalive (void); +Index: mutt/imap/imap.h +=================================================================== +--- mutt.orig/imap/imap.h 2013-09-04 18:24:53.034597181 +0800 ++++ mutt/imap/imap.h 2013-09-04 18:24:53.029596895 +0800 +@@ -72,4 +72,7 @@ int imap_account_match (const ACCOUNT* a1, const ACCOUNT* a2); @@ -84,9 +91,11 @@ by Paul Miller (jettero) +int imap_fast_trash(); + #endif ---- a/mx.c -+++ b/mx.c -@@ -802,6 +802,11 @@ static int trash_append (CONTEXT *ctx) +Index: mutt/mx.c +=================================================================== +--- mutt.orig/mx.c 2013-09-04 18:24:53.034597181 +0800 ++++ mutt/mx.c 2013-09-04 18:24:53.029596895 +0800 +@@ -802,6 +802,11 @@ && stc.st_dev == st.st_dev && stc.st_rdev == st.st_rdev) return 0; /* we are in the trash folder: simple sync */
signature.asc
Description: Digital signature
