[DRE-commits] [SCM] ruby-blankslate.git branch, master, updated. upstream/2.1.2.4-6-gb32c666

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit b32c66686a6ac8244e8fd9592d59c8e64182d074
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Thu Jan 5 10:39:44 2012 +0100

    Revert "conflicts with ruby-builder"
    
    This reverts commit c56b3d54004b09ac9fa60f7116b363e330eecd5a.

diff --git a/debian/changelog b/debian/changelog
index e5674d1..228762a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,5 @@
 ruby-blankslate (2.1.2.4-1) unstable; urgency=low
 
   * Initial release (Closes: #653847)
-  * Conflicts with ruby-builder
 
  -- Cédric Boutillier <cedric.boutillier at gmail.com>  Fri, 30 Dec 2011 16:38:17 +0100
diff --git a/debian/control b/debian/control
index 6549fcf..d407e4f 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Package: ruby-blankslate
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-Conflicts: ruby-builder
 Description: Ruby library providing a class with no predefined methods 
  BlankSlate provides an abstract base class with no predefined
  methods (except for __send__ and __id__).

-- 
ruby-blankslate.git