removing Makefile.in from sidebar patch, allow some patches to correctly update PATCHES

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 499b73d8c8e013f35f095694732f7972da5796d9..a953b6028a8962c068bf252efd018d3ee47cdd03 100644 (file)
--- 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);
  }
  
    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 482288807665643a2bbd3b1867693a9c791807e7..d7771cb088ce7eaac04bf1c44b24cda9a6d582f5 100644 (file)
--- 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 */
    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 125c8fca7ef967ece59f07fc589ff7fb7589a4c3..e7bd250ed820333abed2e5ef3b48bb33e3357450 100644 (file)
--- 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;
            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 7d5a6cba1b8b2f6539b5b320284f979b13cbf564..76cd81ec377fabbb1129407cbd5df7c217f74574 100644 (file)
--- 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 **);
  
  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 1792d1f3d223228b675f9e6751b722ecc4092a0c..e14267085d32f77427acd05d1c5b0549a008c96d 100644 (file)
--- a/debian/patches/mutt-patched/sidebar
+++ b/debian/patches/mutt-patched/sidebar
@@ -508,36 +508,6 @@
  
  nodist_mutt_SOURCES = $(BUILT_SOURCES)
  
  
  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 @@
 --- a/mbox.c
 +++ b/mbox.c
 @@ -104,6 +104,7 @@


@@ -933,13 +903,6 @@
        default:
        ch = -1;
        break;
        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 @@
 --- /dev/null
 +++ b/sidebar.c
 @@ -0,0 +1,333 @@


@@ -1371,3 +1334,7 @@
          FREE (&value);
          return;
        }
          FREE (&value);
          return;
        }

+--- a/PATCHES
++++ b/PATCHES
+@@ -0,0 +1 @@
++patch-1.5.19.sidebar.20090522.txt