restore patches lost when merging NMU diff

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.

diff --git a/debian/control b/debian/control
index df908550a5270ab75d9f802e010fe899fd47e6fd..e95f9f91207af9e6ab1a29d9de208f8e38858473 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,9 @@ Section: admin
 Priority: optional
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Depends: debhelper (>> 5), binutils (>= 2.17.50.0.14), gcc-multilib [i386 amd64], gnu-efi (>=3.0d), po-debconf
-Standards-Version: 3.9.1
+Standards-Version: 3.9.3
+Vcs-Git: git://git.gag.com/debian/elilo
+Vcs-Browser: http://git.gag.com/?p=debian/elilo
 
 Package: elilo
 Architecture: i386 ia64 amd64