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
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!
.\" @(#)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
.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
.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
.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