fix merge errors, update man page to include new and changed commands

diff --git a/cleanup-script.sh b/cleanup-script.sh
index 1fd7d47b90cd3d6bff24d4285dcf9f9af25e2c14..684ac91414a1f273819612c8463876f4d1fde32f 100755 (executable)
--- a/cleanup-script.sh
+++ b/cleanup-script.sh
@@ -218,10 +218,7 @@ then ${echo} 'x - removed lock directory `'${lock_dir}\''.'
 else ${echo} 'x - failed to remove lock directory `'${lock_dir}\''.'
   exit 1
 fi
-<<<<<<< HEAD:cleanup-script.sh
-=======
 
 git add doc/Makefile doc/Makefile.in doc/README
 
->>>>>>> c286dbf484dc985fb63d5c677fc8cd91b5b1d0f6:cleanup-script.sh
 exit 0

diff --git a/debian/changelog b/debian/changelog
index 4a5c8014ca2a04d6ddceb338d284de9ccd562b3c..8a49eb429718612fcdb31e92f02ca14617418a14 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 tar (1.21-1) UNRELEASED; urgency=low
 
   * new upstream version
+  * update man page to include new and changed commands in 1.21
   * version the Replaces entry for cpio, closes: #483355
   * move config.* update to configure target, yields a smaller diff that 
     doesn't clash with git-buildpackage... already had autotools-dev build dep!

diff --git a/debian/tar.1 b/debian/tar.1
index 4e95db1fe6e73aa44286cde249037b354f4c96c4..4b5985eee2dc51957a670367b81352c8edaedb46 100644 (file)
--- a/debian/tar.1
+++ b/debian/tar.1
@@ -1,5 +1,5 @@
 .\" @(#)tar.1 1.11.1 93/19/22 PJV;
-.TH TAR 1 "29 Aug 2007"
+.TH TAR 1 "24 Feb 2009"
 .SH NAME
 tar \- The GNU version of the tar archiving utility
 .SH SYNOPSIS
@@ -169,7 +169,7 @@ keep existing files; don't overwrite them from archive
 .B \-K, \-\-starting\-file F   
 begin at file F in the archive
 .TP
-.B \-\-lzma
+.B \-J, \-\-lzma
 selects LZMA compression algorithm
 .TP
 .B \-l, \-\-check\-links
@@ -178,6 +178,9 @@ print a message if not all links are dumped
 .B \-L, \-\-tape\-length N     
 change tapes after writing N*1024 bytes
 .TP
+.B \-\-lzop
+filter the archive through lzop
+.TP
 .B \-m, \-\-touch
 don't extract file modified time
 .TP
@@ -205,9 +208,15 @@ only store files whose contents have changed after DATE
 .B \-\-no\-anchored
 allow exclusion patterns to match any substring (the default)
 .TP
+.B \-\-no\-auto\-compress
+Cancels the effect of previous \-\-auto\-compress options
+.TP
 .B \-\-no\-ignore\-case
 match patterns case sensitively (the default)
 .TP
+.B \-\-no\-null
+cancels the effect of previous \-\-null option
+.TP
 .B \-\-no\-recursion
 do not recurse into subdirectories
 .TP