[DRE-commits] [SCM] ruby-merb-core.git branch, master, updated. upstream/1.1.3-14-gf9f2d4d

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit b7f0506a9ce8d24215d8c9045ef1f6aef269754c
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Thu May 10 10:25:11 2012 +0200

    s/ruby-bundler/bundler/

diff --git a/debian/control b/debian/control
index 941d5fb..e050dcc 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ XB-Ruby-Versions: ${ruby:Versions}
 Replaces: merb-core (<< 1.1.3-1~), libmerb-core-ruby (<< 1.1.3-1~), libmerb-core-ruby1.8 (<< 1.1.3-1~)
 Breaks: merb-core (<< 1.1.3-1~), libmerb-core-ruby (<< 1.1.3-1~), libmerb-core-ruby1.8 (<< 1.1.3-1~)
 Provides: merb-core, libmerb-core-ruby, libmerb-core-ruby1.8
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-extlib (>= 0.9.13), ruby-erubis (>= 2.6.2), rake, ruby-rack, ruby-mime-types (>= 1.16), ruby-bundler
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-extlib (>= 0.9.13), ruby-erubis (>= 2.6.2), rake, ruby-rack, ruby-mime-types (>= 1.16), bundler
 Description: Core libraries for the Merb MVC framework
  Ruby-based MVC framework that is agnostic to ORM, JavaScript library,
  and template languages. Merb is plugin-based, so the core is small and

-- 
ruby-merb-core.git