restore patches lost when merging NMU diff

[debian/elilo] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index e403144a7353c791f4cf3a873ff46f4c27d243f0..9d4d3a30b71264c8150701b573f42a41b53902a3 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+elilo (3.12-5) unstable; urgency=low
+
+  * merge 3.12-4.1 diff from Christian Perrier
+  * add VCS entries to control file
+  * update standards version
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 29 Jun 2012 09:25:49 -0600
+
 elilo (3.12-4.1) unstable; urgency=low
 
   * Non-maintainer upload.