Merge branch 'dfsg-orig' into dfsg-debian

[debian/tar] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 29a97b883b4cf0757a7ad5684b3b542634fb1ef8..cab5b253f10fe98ad6bdf32b11068b3e371ed9f0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+tar (1.26-1) unstable; urgency=low
+
+  * new upstream version
+  * add a check to the rules file to ensure test suite is not attempted while
+    building as root, closes: #596268
+
+ -- Bdale Garbee <bdale@gag.com>  Wed, 17 Aug 2011 10:46:03 -0700
+
+tar (1.25-3) unstable; urgency=low
+
+  * cherry-pick some upstream commits that appear to address open bugs
+  * fix for --one-file-system and --listed-incremental together,
+    closes: #603371, #604394, #604698
+  * fix for FreeBSD symlink incompatibility with POSIX, closes: #602241
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 06 Dec 2010 20:35:55 -0700
+
 tar (1.25-2) unstable; urgency=low
 
   * accept a "hack" from Joey Hess to work around an unfortunate side effect