acknowledge NMU merge with start of a -2 changelog entry

[debian/gzip] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index 9ed8c632b5ea4e78cd989357b439df926351feab..63466b170814517971a0e15878d60373afa7f6e8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,29 @@
-gzip (1.4-6) unstable; urgency=low
+gzip (1.5-2) UNRELEASED; urgency=low
 
-  * patch to restore zgrep -h from Pär-Ola Nilsson, closes: #658734
+  * merge diff from -1.1 NMU by Thorsten Glaser
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 19 Jun 2012 14:04:08 -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.
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 12 Apr 2012 11:38:56 -0600
+ -- 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
+  * patch to add --rsyncable doc to info page from Jörgen Grahn,
+    closes: #637626
+  * patch to improve zdiff doc from Stéphane Aulery, closes: #269612
+  * patches to fix RFC URLs from Stéphane Aulery, closes: #636182
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 19 Jun 2012 14:04:08 -0600
 
 gzip (1.4-5) unstable; urgency=low