X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=debian%2Fchangelog;h=9d4d3a30b71264c8150701b573f42a41b53902a3;hb=81447a679eb7778b32954d46c78ed637fc2ecbb3;hp=4b0feed4ae36761a8d486917b543dc2530c85df1;hpb=fdb06bebf6184cb4a2734e79f6e8941218316c80;p=debian%2Felilo

diff --git a/debian/changelog b/debian/changelog
index 4b0feed..9d4d3a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,19 @@
-elilo (3.12-5) UNRELEASED; urgency=low
+elilo (3.12-5) unstable; urgency=low
 
-  * add Vcs entries to control file
+  * merge 3.12-4.1 diff from Christian Perrier
+  * add VCS entries to control file
+  * update standards version
 
- -- Bdale Garbee <bdale@gag.com>  Thu, 11 Nov 2010 18:10:38 -0700
+ -- Bdale Garbee <bdale@gag.com>  Fri, 29 Jun 2012 09:25:49 -0600
+
+elilo (3.12-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pending l10n issues. Debconf translations:
+    - Danish (Joe Hansen).  Closes: #602446
+    - Polish (Michał Kułach).  Closes: #657502
+
+ -- Christian Perrier <bubulle@debian.org>  Wed, 01 Feb 2012 20:13:32 +0100
 
 elilo (3.12-4) unstable; urgency=low