Instead of trying to maintain the PATCHES file, put "quilt applied" output there.

diff --git a/debian/changelog b/debian/changelog
index a8b1e02bcda1bb7d389ec2208e191e6863285802..fb2758f8c4063bb2b851dfeb383477b6d4987430 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ mutt (1.5.20-8~unrel) unreleased; urgency=low
   * Explicitely use source format 1.0 due to the quilt magic we are using to
     built mutt-patched.
   * Switch to tokyocabinet (Closes: #530670)
+  * Instead of trying to maintain the PATCHES file, put "quilt applied" output
+    there.
 
- -- Christoph Berg <myon@debian.org>  Sun, 30 May 2010 12:38:59 +0200
+ -- Christoph Berg <myon@debian.org>  Sun, 30 May 2010 23:20:21 +0200
 
 mutt (1.5.20-7) unstable; urgency=low
 

diff --git a/debian/patches/features/ifdef b/debian/patches/features/ifdef
index 887ba4037096372f2b72258580420a4c7e793e2f..28913b51f60f55fa0b1892a2c2ab979240864292 100644 (file)
--- a/debian/patches/features/ifdef
+++ b/debian/patches/features/ifdef
@@ -28,7 +28,7 @@ ifdef  trash  set trash=~/Mail/trash
 == END PATCH
 --- a/init.c
 +++ b/init.c
-@@ -635,6 +635,65 @@
+@@ -635,6 +635,65 @@ static int remove_from_rx_list (RX_LIST
    return (rv);
  }
  
@@ -96,7 +96,7 @@ ifdef  trash  set trash=~/Mail/trash
    do
 --- a/init.h
 +++ b/init.h
-@@ -3413,6 +3413,7 @@
+@@ -3413,6 +3413,7 @@ static int parse_lists (BUFFER *, BUFFER
  static int parse_unlists (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_alias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unalias (BUFFER *, BUFFER *, unsigned long, BUFFER *);
@@ -104,7 +104,7 @@ ifdef  trash  set trash=~/Mail/trash
  static int parse_ignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_unignore (BUFFER *, BUFFER *, unsigned long, BUFFER *);
  static int parse_source (BUFFER *, BUFFER *, unsigned long, BUFFER *);
-@@ -3463,6 +3464,7 @@
+@@ -3463,6 +3464,7 @@ struct command_t Commands[] = {
    { "group",          parse_group,            0 },
    { "ungroup",                parse_ungroup,          0 },
    { "hdr_order",      parse_list,             UL &HeaderOrderList },
@@ -114,7 +114,7 @@ ifdef  trash  set trash=~/Mail/trash
  #endif
 --- a/doc/manual.xml.head
 +++ b/doc/manual.xml.head
-@@ -4087,6 +4087,28 @@
+@@ -4087,6 +4087,28 @@ considered to be an executable program f
  
  </sect1>
  
@@ -143,7 +143,3 @@ ifdef  trash  set trash=~/Mail/trash
  <sect1 id="unhook">
  <title>Removing Hooks</title>
  
---- /dev/null
-+++ b/PATCHES
-@@ -0,0 +1 @@
-+patch-1.5.13.cd.ifdef.2

diff --git a/debian/rules b/debian/rules
index e6f67448477f708278dbce8f5667e8368c3d24bb..7db0d8fc32a793c8e39635d935c2616f7344e85e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 include /usr/share/quilt/quilt.make
+QUILT = QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null
 
 ###################### user serviceable parts ######################
 
@@ -96,6 +97,7 @@ $(objdir)-patched/build-stamp: $(QUILT_STAMPFN)
        
 ifeq ($(BUILD_PATCHED),yes)
        ###################### building mutt-patched ######################
+       $(QUILT) applied > PATCHES
        autoreconf --install --include=m4
        cd $(objdir)-patched && \
        env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \
@@ -112,7 +114,8 @@ endif
 build build-arch: $(objdir)/build-stamp
 $(objdir)/build-stamp: $(objdir)-patched/build-stamp
        ###################### building mutt ######################
-       QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null pop mutt.org
+       $(QUILT) pop mutt.org
+       $(QUILT) applied > PATCHES
        
        autoreconf --install --include=m4
        -mkdir $(objdir)
@@ -197,7 +200,7 @@ clean: unpatch
        
        # please dpkg-source
        rm -f po/*.gmo
-       touch PATCHES
+       echo -n > PATCHES
        
        # remove build trees
        rm -rf $(objdir) $(objdir)-patched
@@ -206,9 +209,6 @@ clean: unpatch
        rm -f configure config.h.in
        rm -f Makefile.in contrib/Makefile.in imap/Makefile.in doc/Makefile.in m4/Makefile.in
        
-       # clean PATCHES hunks (blame quilt refresh)
-       for p in `grep -rl PATCHES debian/patches` ; do perl -wi debian/fix-PATCHES.pl $$p ; done
-       
        dh_clean
 
 .PHONY: configure build build-arch build-indep clean install binary binary-arch binary-indep patch