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

[Tollef Fog Heen]

The following commit has been merged in the master branch:
commit f6dbc64a7e17b249b433cfd812a5a30e4ade2749
Author: Tollef Fog Heen <tfheen at debian.org>
Date:   Sat Apr 21 21:23:49 2012 +0200

    Add transitional packages, update dependencies

diff --git a/debian/control b/debian/control
index 811f7a5..031e6e8 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,36 @@ XS-Ruby-Versions: all
 Package: ruby-merb-core
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter
-# extlib (>= 0.9.13), erubis (>= 2.6.2), rake (>= 0), rack (>= 0), mime-types (>= 1.16), bundler (>= 0), rspec (>= 1.2.9, development), webrat (>= 0.3.1, development)
+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
 Description: Merb plugin that provides caching (page, action, fragment, object)
  Merb. Pocket rocket web framework.
+
+Package: merb-core
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-merb-core
+Description: Transitional package for ruby-merb-core
+ This is a transitional package to ease upgrades to the ruby-merb-core
+ package. It can safely be removed.
+
+Package: libmerb-core-ruby
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-merb-core
+Description: Transitional package for ruby-merb-core
+ This is a transitional package to ease upgrades to the ruby-merb-core
+ package. It can safely be removed.
+
+Package: libmerb-core-ruby1.8
+Section: oldlibs
+Priority: extra
+Architecture: all
+Depends: ${misc:Depends}, ruby-merb-core
+Description: Transitional package for ruby-merb-core
+ This is a transitional package to ease upgrades to the ruby-merb-core
+ package. It can safely be removed.

-- 
ruby-merb-core.git