[DRE-commits] [SCM] ruby-lockfile.git branch, master, updated. debian/2.1.0-1-7-gd8c8119

[Per Andersson]

The following commit has been merged in the master branch:
commit d8c8119daf414805df611b69ac669b37b0c38053
Author: Per Andersson <avtobiff at gmail.com>
Date:   Sat Jun 9 00:00:56 2012 +0200

    Update changelog.

diff --git a/debian/changelog b/debian/changelog
index 0b4fc6c..41bef53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 ruby-lockfile (2.1.0-2) unstable; urgency=low
 
   * Correct binary ruby versions tag.
+  * Relax conflicts with transitional package to breaks.
+  * Escape hyphens used in rlock.1 man page.
 
- -- Per Andersson <avtobiff at gmail.com >  Fri, 08 Jun 2012 23:41:57 +0200
+ -- Per Andersson <avtobiff at gmail.com>  Fri, 08 Jun 2012 23:41:57 +0200
 
 ruby-lockfile (2.1.0-1) unstable; urgency=low
 

-- 
ruby-lockfile.git