[DRE-commits] [SCM] ruby-blankslate.git branch, master, updated. debian/2.1.2.4-1-1-g032c39d

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 032c39dcc4c5d6209b1501e59c5dd046e9836f60
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jan 28 09:47:47 2012 -0200

    Fix upgrades from testing

diff --git a/debian/changelog b/debian/changelog
index 228762a..57723ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-blankslate (2.1.2.4-2) unstable; urgency=low
+
+  * Team upload.
+  * Fixes upgrades from testing by adding Breaks/Replaces on ruby-builder
+    versions that still contain an embedded copy of blankslate.rb
+    (Closes: #657541)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 28 Jan 2012 09:44:07 -0200
+
 ruby-blankslate (2.1.2.4-1) unstable; urgency=low
 
   * Initial release (Closes: #653847)
diff --git a/debian/control b/debian/control
index d407e4f..9903de3 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,8 @@ Package: ruby-blankslate
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
+Replaces: ruby-builder (<< 3.0.0-2~)
+Breaks: ruby-builder (<< 3.0.0-2~)
 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