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

[Cédric Boutillier]

The following commit has been merged in the master branch:
commit c56b3d54004b09ac9fa60f7116b363e330eecd5a
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Wed Jan 4 13:22:09 2012 +0100

    conflicts with ruby-builder

diff --git a/debian/changelog b/debian/changelog
index 228762a..e5674d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 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 d407e4f..6549fcf 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ 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