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

[tar] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index cead7657abe13ed8eb64a5c1a11f72f026357ecf..8a49eb429718612fcdb31e92f02ca14617418a14 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-tar (1.20-2) UNRELEASED; urgency=low
+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!
 
- -- Bdale Garbee <bdale@gag.com>  Fri, 30 May 2008 10:47:42 -0600
+ -- Bdale Garbee <bdale@gag.com>  Tue, 24 Feb 2009 23:16:14 -0700
 
 tar (1.20-1) unstable; urgency=low