[SCM] Packaging for lierolibre branch, oneiric, updated. upstream/1.35_b2+20100124.1-52-g12cf6aa

[Martin Erik Werner]

The following commit has been merged in the oneiric branch:
commit cdc5601791b471286988f8b0c8d21b7d12a66f11
Merge: 201e63e2e99ff7d26fe4d425abf48e59164ff7a1 8bc3ba69ff79847e2d7d7668173158fda6fb122d
Author: Martin Erik Werner <martinerikwerner at gmail.com>
Date:   Thu May 3 15:59:41 2012 +0200

    Merge branch 'master' into oneiric
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index ed33a06,4f61826..1425c22
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,19 -1,5 +1,19 @@@
 -lierolibre (0.3-1) unstable; urgency=low
 +lierolibre (0.2-1~ppa1~oneiric) oneiric; urgency=low
 +
 +  * New upstream version
 +  * Release to PPA
 +  * Modify changelog for unreleased Debian version
 +
 + -- Martin Erik Werner <martinerikwerner at gmail.com>  Fri, 27 Apr 2012 21:38:55 +0200
 +
 +lierolibre (0.1-1~oneiric1) oneiric; urgency=low
 +
 +  * Release to PPA
 +
 + -- Martin Erik Werner <martinerikwerner at gmail.com>  Tue, 24 Apr 2012 00:08:34 +0200
 +
 +lierolibre (0.1-1) UNREALEASED; urgency=low
  
    * Initial release (Closes: #648681)
  
-  -- Martin Erik Werner <martinerikwerner at gmail.com>  Thu, 26 Apr 2012 01:47:16 +0200
+  -- Martin Erik Werner <martinerikwerner at gmail.com>  Wed, 02 May 2012 20:50:40 +0200

-- 
Packaging for lierolibre