From 5ae55757749249636c92aa7e3ddc2f7e83b52eb0 Mon Sep 17 00:00:00 2001
From: Antonio Radici <antonio@dyne.org>
Date: Sun, 24 May 2009 17:12:37 +0100
Subject: [PATCH] removing Makefile.in from sidebar patch, allow some patches
 to correctly update PATCHES

---
 .../patch-1.5.4.vk.pgp_verbose_mime           |  7 ----
 debian/patches/features/maildir-mtime         |  5 ---
 debian/patches/features/purge-message         |  7 ----
 debian/patches/features/xtitles               |  6 ---
 debian/patches/mutt-patched/sidebar           | 41 ++-----------------
 5 files changed, 4 insertions(+), 62 deletions(-)

diff --git a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
index 499b73d..a953b60 100644
--- a/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
+++ b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime
@@ -41,10 +41,3 @@
  
    return (a);
  }
---- a/PATCHES
-+++ b/PATCHES
-@@ -1,3 +1,4 @@
-+patch-1.5.4.vk.pgp_verbose_mime
- patch-1.5.13.cd.purge_message.3.4
- patch-1.5.13.nt+ab.xtitles.4
- patch-1.5.6.dw.maildir-mtime.1
diff --git a/debian/patches/features/maildir-mtime b/debian/patches/features/maildir-mtime
index 4822888..d7771cb 100644
--- a/debian/patches/features/maildir-mtime
+++ b/debian/patches/features/maildir-mtime
@@ -174,8 +174,3 @@ The home page for this patch is:
    short new;			/* mailbox has new mail */
    short notified;		/* user has been notified */
    short magic;			/* mailbox type */
---- a/PATCHES
-+++ b/PATCHES
-@@ -1 +1,2 @@
-+patch-1.5.6.dw.maildir-mtime.1
- patch-1.5.13.cd.ifdef.2
diff --git a/debian/patches/features/purge-message b/debian/patches/features/purge-message
index 125c8fc..e7bd250 100644
--- a/debian/patches/features/purge-message
+++ b/debian/patches/features/purge-message
@@ -209,10 +209,3 @@ of having a trash folder feature.
  	    mutt_set_flag (Context, Context->hdrs[Context->v2r[i]], M_DELETE, 
  			  (op == M_DELETE));
  	    break;
---- a/PATCHES
-+++ b/PATCHES
-@@ -1,3 +1,4 @@
-+patch-1.5.13.cd.purge_message.3.4
- patch-1.5.13.nt+ab.xtitles.4
- patch-1.5.6.dw.maildir-mtime.1
- patch-1.5.13.cd.ifdef.2
diff --git a/debian/patches/features/xtitles b/debian/patches/features/xtitles
index 7d5a6cb..76cd81e 100644
--- a/debian/patches/features/xtitles
+++ b/debian/patches/features/xtitles
@@ -164,9 +164,3 @@ This is the xterm title patch as found on the mutt mailing lists.
  
  MUTTMENU *mutt_new_menu (int);
  void mutt_menuDestroy (MUTTMENU **);
---- a/PATCHES
-+++ b/PATCHES
-@@ -1,2 +1,3 @@
-+patch-1.5.13.nt+ab.xtitles.4
- patch-1.5.6.dw.maildir-mtime.1
- patch-1.5.13.cd.ifdef.2
diff --git a/debian/patches/mutt-patched/sidebar b/debian/patches/mutt-patched/sidebar
index 1792d1f..e142670 100644
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -508,36 +508,6 @@
  
  nodist_mutt_SOURCES = $(BUILT_SOURCES)
  
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -84,7 +84,7 @@
- 	thread.$(OBJEXT) charset.$(OBJEXT) history.$(OBJEXT) \
- 	lib.$(OBJEXT) muttlib.$(OBJEXT) editmsg.$(OBJEXT) \
- 	mbyte.$(OBJEXT) url.$(OBJEXT) ascii.$(OBJEXT) \
--	crypt-mod.$(OBJEXT)
-+	crypt-mod.$(OBJEXT) sidebar.$(OBJEXT)
- am__objects_1 = patchlist.$(OBJEXT)
- nodist_mutt_OBJECTS = $(am__objects_1)
- mutt_OBJECTS = $(am_mutt_OBJECTS) $(nodist_mutt_OBJECTS)
-@@ -310,7 +310,8 @@
- 	score.c send.c sendlib.c signal.c sort.c \
- 	status.c system.c thread.c charset.c history.c lib.c \
- 	muttlib.c editmsg.c mbyte.c \
--	url.c ascii.c crypt-mod.c crypt-mod.h
-+	url.c ascii.c crypt-mod.c crypt-mod.h \
-+	sidebar.c
- 
- nodist_mutt_SOURCES = $(BUILT_SOURCES)
- mutt_LDADD = @MUTT_LIB_OBJECTS@ @LIBOBJS@ $(LIBIMAP) $(MUTTLIBS) \
-@@ -342,7 +343,7 @@
- 	README.SSL smime.h \
- 	muttbug pgppacket.h depcomp ascii.h BEWARE PATCHES patchlist.sh \
- 	ChangeLog mkchangelog.sh mutt_idna.h \
--	snprintf.c regex.c crypt-gpgme.h hcachever.sh.in
-+	snprintf.c regex.c crypt-gpgme.h sidebar.h hcachever.sh.in
- 
- EXTRA_SCRIPTS = smime_keys
- mutt_dotlock_SOURCES = mutt_dotlock.c
 --- a/mbox.c
 +++ b/mbox.c
 @@ -104,6 +104,7 @@
@@ -933,13 +903,6 @@
        default:
  	ch = -1;
  	break;
---- a/PATCHES
-+++ b/PATCHES
-@@ -1,3 +1,4 @@
-+patch-1.5.19.sidebar.20090522.txt
- patch-1.5.18.rr.compressed.1
- patch-1.5.4.vk.pgp_verbose_mime
- patch-1.5.13.cd.purge_message.3.4
 --- /dev/null
 +++ b/sidebar.c
 @@ -0,0 +1,333 @@
@@ -1371,3 +1334,7 @@
          FREE (&value);
          return;
        }
+--- a/PATCHES
++++ b/PATCHES
+@@ -0,0 +1 @@
++patch-1.5.19.sidebar.20090522.txt
-- 
2.43.0