From 9af050f9889674fb04518742776b1522a2bd1c21 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 12 Apr 2012 11:48:11 -0600 Subject: [PATCH] merge rsyncable doc diff --- debian/changelog | 2 ++ debian/patches/rsyncable-doc.diff | 27 --------------------------- debian/patches/rsyncable.diff | 27 +++++++++++++++++++++++++++ debian/patches/series | 1 + doc/gzip.texi | 9 +++++++++ 5 files changed, 39 insertions(+), 27 deletions(-) delete mode 100644 debian/patches/rsyncable-doc.diff diff --git a/debian/changelog b/debian/changelog index 006d5cf..7d35092 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ gzip (1.4-6) unstable; urgency=low * patch to restore zgrep -h from Pär-Ola Nilsson, closes: #658734 * patch to fix pack reference in gzip man page from Stéphane Aulery, closes: #308522 + * patch to add --rsyncable doc to info page from Jörgen Grahn, + closes: #637626 -- Bdale Garbee Thu, 12 Apr 2012 11:38:56 -0600 diff --git a/debian/patches/rsyncable-doc.diff b/debian/patches/rsyncable-doc.diff deleted file mode 100644 index 1dac01e..0000000 --- a/debian/patches/rsyncable-doc.diff +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/doc/gzip.texi b/doc/gzip.texi -index 84887c3..ecd4e00 100644 ---- a/doc/gzip.texi -+++ b/doc/gzip.texi -@@ -207,6 +207,7 @@ Mandatory arguments to long options are mandatory for short options too. - -V, --version display version number - -1, --fast compress faster - -9, --best compress better -+ --rsyncable Make rsync-friendly archive - - With no FILE, or when FILE is -, read standard input. - -@@ -361,6 +362,14 @@ in the uncompressed input when syncronizing two files compressed with - this flag. @code{gunzip} cannot tell the difference between a - compressed file created with this option, and one created without it. - -+@item --rsyncable -+While compressing, synchronize the output occasionally based on -+the input. This increases size by less than 1 percent most -+cases, but means that the @command{rsync} program can much more efficiently -+synchronize files compressed with this flag. @command{gunzip} -+cannot tell the difference between a compressed file created -+with this option, and one created without it. -+ - @item --suffix @var{suf} - @itemx -S @var{suf} - Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be diff --git a/debian/patches/rsyncable.diff b/debian/patches/rsyncable.diff index 96780f3..e615d98 100644 --- a/debian/patches/rsyncable.diff +++ b/debian/patches/rsyncable.diff @@ -254,3 +254,30 @@ index 0c3dd68..5270c56 100644 extern off_t bytes_in; /* number of input bytes */ extern off_t bytes_out; /* number of output bytes */ +diff --git a/doc/gzip.texi b/doc/gzip.texi +index 84887c3..ecd4e00 100644 +--- a/doc/gzip.texi ++++ b/doc/gzip.texi +@@ -207,6 +207,7 @@ Mandatory arguments to long options are mandatory for short options too. + -V, --version display version number + -1, --fast compress faster + -9, --best compress better ++ --rsyncable Make rsync-friendly archive + + With no FILE, or when FILE is -, read standard input. + +@@ -361,6 +362,14 @@ in the uncompressed input when syncronizing two files compressed with + this flag. @code{gunzip} cannot tell the difference between a + compressed file created with this option, and one created without it. + ++@item --rsyncable ++While compressing, synchronize the output occasionally based on ++the input. This increases size by less than 1 percent most ++cases, but means that the @command{rsync} program can much more efficiently ++synchronize files compressed with this flag. @command{gunzip} ++cannot tell the difference between a compressed file created ++with this option, and one created without it. ++ + @item --suffix @var{suf} + @itemx -S @var{suf} + Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be diff --git a/debian/patches/series b/debian/patches/series index 51c69c0..97e96d4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,6 @@ getdtablesize-missing.diff rsyncable.diff +rsyncable-doc.diff zless-LESSOPEN.diff sys_stat.in.h.diff determinism.diff diff --git a/doc/gzip.texi b/doc/gzip.texi index 84887c3..ecd4e00 100644 --- a/doc/gzip.texi +++ b/doc/gzip.texi @@ -207,6 +207,7 @@ Mandatory arguments to long options are mandatory for short options too. -V, --version display version number -1, --fast compress faster -9, --best compress better + --rsyncable Make rsync-friendly archive With no FILE, or when FILE is -, read standard input. @@ -361,6 +362,14 @@ in the uncompressed input when syncronizing two files compressed with this flag. @code{gunzip} cannot tell the difference between a compressed file created with this option, and one created without it. +@item --rsyncable +While compressing, synchronize the output occasionally based on +the input. This increases size by less than 1 percent most +cases, but means that the @command{rsync} program can much more efficiently +synchronize files compressed with this flag. @command{gunzip} +cannot tell the difference between a compressed file created +with this option, and one created without it. + @item --suffix @var{suf} @itemx -S @var{suf} Use suffix @var{suf} instead of @samp{.gz}. Any suffix can be -- 2.30.2