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

[tar] / debian / changelog

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!