[DRE-commits] [SCM] ruby-builder.git branch, master, updated. upstream/3.0.0-10-gc8374a2

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 55d5b7328a8bf4e48d1821db6b2a632ed640ae37
Author: Antonio Terceiro <terceiro at softwarelivre.org>
Date:   Fri Aug 12 00:25:19 2011 -0700

    mention cherry-picked patch in changelog

diff --git a/debian/changelog b/debian/changelog
index 924d406..7c1a368 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,8 +9,11 @@ ruby-builder (3.0.0-1) UNRELEASED; urgency=low
 
   [ Antonio Terceiro ]
   * Disable test that was not supposed to be distributed
+  * Cherry-picked patch by Diego Elio Pettenò from to disable Blankslate tests
+    under Ruby 1.9 (c6ab2a7c here):
+    https://github.com/Flameeyes/builder/commit/770b5acf1736297669d000d1f673ba287ef1d95e
 
- -- Antonio Terceiro <terceiro at debian.org>  Thu, 11 Aug 2011 23:54:34 -0700
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 12 Aug 2011 00:22:58 -0700
 
 libbuilder-ruby (2.1.2-2) unstable; urgency=low
 

-- 
ruby-builder.git