Tweaked the diff headers.

diff --git a/gzip-rsyncable-checksum.diff b/gzip-rsyncable-checksum.diff
index b6e5e0b..fb66473 100644 (file)
--- a/gzip-rsyncable-checksum.diff
+++ b/gzip-rsyncable-checksum.diff
@@ -3,8 +3,8 @@ NOTE: this patch is for _gzip_!
 Kevin Day's version of the gzip-rsyncable patch that uses the rsync
 checksum algorithm.
 
---- original-1.2.2/deflate.c   2004-09-15 10:28:14.000000000 -0700
-+++ rsyncable-1.2.2/deflate.c  2005-02-17 14:37:14.660957200 -0700
+--- gzip-1.2.2/deflate.c       2004-09-15 10:28:14.000000000 -0700
++++ rsyncable/deflate.c        2005-02-17 14:37:14.660957200 -0700
 @@ -98,6 +98,10 @@
                              int length));
  #endif
@@ -350,9 +350,8 @@ checksum algorithm.
      return flush == Z_FINISH ? finish_done : block_done;
  }
  #endif /* FASTEST */
-diff -Naur original-1.2.2/deflate.h rsyncable-1.2.2/deflate.h
---- original-1.2.2/deflate.h   2004-02-24 07:38:44.000000000 -0700
-+++ rsyncable-1.2.2/deflate.h  2005-02-17 13:46:12.056551200 -0700
+--- gzip-1.2.2/deflate.h       2004-02-24 07:38:44.000000000 -0700
++++ rsyncable/deflate.h        2005-02-17 13:46:12.056551200 -0700
 @@ -254,6 +254,17 @@
       * are always zero.
       */
@@ -380,9 +379,8 @@ diff -Naur original-1.2.2/deflate.h rsyncable-1.2.2/deflate.h
  void _tr_align        OF((deflate_state *s));
  void _tr_stored_block OF((deflate_state *s, charf *buf, ulg stored_len,
                            int eof));
-diff -Naur original-1.2.2/minigzip.c rsyncable-1.2.2/minigzip.c
---- original-1.2.2/minigzip.c  2003-11-04 18:19:26.000000000 -0700
-+++ rsyncable-1.2.2/minigzip.c 2005-02-17 13:11:35.472851600 -0700
+--- gzip-1.2.2/minigzip.c      2003-11-04 18:19:26.000000000 -0700
++++ rsyncable/minigzip.c       2005-02-17 13:11:35.472851600 -0700
 @@ -215,7 +215,7 @@
      }
      gz_compress(in, out);
@@ -413,9 +411,8 @@ diff -Naur original-1.2.2/minigzip.c rsyncable-1.2.2/minigzip.c
  }
  
  
-diff -Naur original-1.2.2/trees.c rsyncable-1.2.2/trees.c
---- original-1.2.2/trees.c     2004-02-24 07:36:38.000000000 -0700
-+++ rsyncable-1.2.2/trees.c    2005-02-17 13:09:38.768435100 -0700
+--- gzip-1.2.2/trees.c 2004-02-24 07:36:38.000000000 -0700
++++ rsyncable/trees.c  2005-02-17 13:09:38.768435100 -0700
 @@ -918,10 +918,11 @@
   * Determine the best encoding for the current block: dynamic trees, static
   * trees or store, and output the encoded block to the zip file.
@@ -442,9 +439,8 @@ diff -Naur original-1.2.2/trees.c rsyncable-1.2.2/trees.c
      }
      Tracev((stderr,"\ncomprlen %lu(%lu) ", s->compressed_len>>3,
             s->compressed_len-7*eof));
-diff -Naur original-1.2.2/zlib.def rsyncable-1.2.2/zlib.def
---- original-1.2.2/zlib.def    1969-12-31 17:00:00.000000000 -0700
-+++ rsyncable-1.2.2/zlib.def   2005-02-17 14:01:48.972258000 -0700
+--- gzip-1.2.2/zlib.def        1969-12-31 17:00:00.000000000 -0700
++++ rsyncable/zlib.def 2005-02-17 14:01:48.972258000 -0700
 @@ -0,0 +1,61 @@
 +LIBRARY
 +; zlib data compression library
@@ -508,9 +504,8 @@ diff -Naur original-1.2.2/zlib.def rsyncable-1.2.2/zlib.def
 +    zError
 +      deflateSetRsyncParameters_
 \ No newline at end of file
-diff -Naur original-1.2.2/zlib.h rsyncable-1.2.2/zlib.h
---- original-1.2.2/zlib.h      2004-10-03 22:57:26.000000000 -0700
-+++ rsyncable-1.2.2/zlib.h     2005-02-17 14:02:11.753362200 -0700
+--- gzip-1.2.2/zlib.h  2004-10-03 22:57:26.000000000 -0700
++++ rsyncable/zlib.h   2005-02-17 14:02:11.753362200 -0700
 @@ -179,6 +179,13 @@
  
  #define Z_NULL  0  /* for initializing zalloc, zfree, opaque */

diff --git a/gzip-rsyncable.diff b/gzip-rsyncable.diff
index f8704fc..844ed93 100644 (file)
--- a/gzip-rsyncable.diff
+++ b/gzip-rsyncable.diff
@@ -5,7 +5,7 @@ tried out in the default gzip for Debian Sarge, and may go into the
 upstream gzip at somepoint in the not-too-distant future.
 
 --- gzip-1.3.5/deflate.c       1999-10-07 23:46:28 -0700
-+++ deflate.c  2005-02-05 09:40:33 -0800
++++ rsyncable/deflate.c        2005-02-05 09:40:33 -0800
 @@ -122,6 +122,14 @@
  #endif
  /* Matches of length 3 are discarded if their distance exceeds TOO_FAR */
@@ -183,7 +183,7 @@ upstream gzip at somepoint in the not-too-distant future.
              lookahead--;
          }
 --- gzip-1.3.5/gzip.c  2002-09-28 00:38:43 -0700
-+++ gzip.c     2005-02-05 09:40:33 -0800
++++ rsyncable/gzip.c   2005-02-05 09:40:33 -0800
 @@ -256,6 +256,7 @@
  unsigned insize;           /* valid bytes in inbuf */
  unsigned inptr;            /* index of next byte to be processed in inbuf */
@@ -219,7 +219,7 @@ upstream gzip at somepoint in the not-too-distant future.
  #ifdef NO_MULTIPLE_DOTS
              if (*optarg == '.') optarg++;
 --- gzip-1.3.5/gzip.h  2001-09-30 23:53:41 -0700
-+++ gzip.h     2005-02-05 09:40:33 -0800
++++ rsyncable/gzip.h   2005-02-05 09:40:33 -0800
 @@ -133,6 +133,7 @@
  extern unsigned insize; /* valid bytes in inbuf */
  extern unsigned inptr;  /* index of next byte to be processed in inbuf */
@@ -238,7 +238,7 @@ upstream gzip at somepoint in the not-too-distant future.
          /* in bits.c */
  void     bi_init    OF((file_t zipfile));
 --- gzip-1.3.5/gzip.texi       2002-09-29 23:57:29 -0700
-+++ gzip.texi  2005-02-05 09:40:33 -0800
++++ rsyncable/gzip.texi        2005-02-05 09:40:33 -0800
 @@ -334,6 +334,14 @@
  into the directory and compress all the files it finds there (or
  decompress them in the case of @code{gunzip}).
@@ -255,7 +255,7 @@ upstream gzip at somepoint in the not-too-distant future.
  @itemx -S @var{suf}
  Use suffix @samp{@var{suf}} instead of @samp{.gz}. Any suffix can be
 --- gzip-1.3.5/trees.c 1999-10-05 22:00:00 -0700
-+++ trees.c    2005-02-05 09:40:33 -0800
++++ rsyncable/trees.c  2005-02-05 09:40:33 -0800
 @@ -46,12 +46,13 @@
   *      void ct_tally (int dist, int lc);
   *          Save the match info and tally the frequency counts.