X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fchangelog;h=9f07245c9a743f9e42d8effac20e6be328885cb5;hb=504e9df40c85080f24c36002912956be692465f3;hp=bf4fe47cb24a85aa7241e8439a09518356c484dd;hpb=b2747d0988265018e8b4db1ba44214b0e506d09a;p=debian%2Fgzip

diff --git a/debian/changelog b/debian/changelog
index bf4fe47..9f07245 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,21 @@
-gzip (1.4-6) unstable; urgency=low
+gzip (1.6-1) UNRELEASED; urgency=low
 
+  * new upstream version
+  * merge diff from 1.5-1.1 NMU by Thorsten Glaser
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 11 Jun 2013 08:49:52 -0600
+
+gzip (1.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload with permission of maintainer.
+  * Clean up the debian/rules file to fix FTBFS caused by
+    inclusion of build-indep on binary-arch target.
+
+ -- Thorsten Glaser <tg@mirbsd.de>  Wed, 20 Jun 2012 16:10:12 +0200
+
+gzip (1.5-1) unstable; urgency=low
+
+  * new upstream version, with updated gnulib that closes: #669434
   * patch to restore zgrep -h from Pär-Ola Nilsson, closes: #658734
   * patch to fix pack reference in gzip man page from Stéphane Aulery,
     closes: #308522
@@ -7,10 +23,8 @@ gzip (1.4-6) unstable; urgency=low
     closes: #637626
   * patch to improve zdiff doc from Stéphane Aulery, closes: #269612
   * patches to fix RFC URLs from Stéphane Aulery, closes: #636182
-  * patch from Stéphane Aulery to improve zdiff behavior when file is
-    compressed without explicit extension, closes: #343575, #630111
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 12 Apr 2012 11:38:56 -0600
+ -- Bdale Garbee <bdale@gag.com>  Tue, 19 Jun 2012 14:04:08 -0600
 
 gzip (1.4-5) unstable; urgency=low