[DRE-commits] [SCM] ruby-locale-rails.git branch, master, updated. upstream/2.0.5-5-g7c75d78

[Gunnar Wolf]

The following commit has been merged in the master branch:
commit 7c75d78b19e25b731855e2f38ead150a0a770a43
Author: Gunnar Wolf <gwolf at gwolf.org>
Date:   Fri Sep 2 05:55:24 2011 -0500

    Oh, bummer: Didn't check that liblocale-ruby (upon which we depend) does not provide a dummy binary package - We have to depend on either 1.8 or 1.9.1 explicitly

diff --git a/debian/changelog b/debian/changelog
index 03540cb..a71e3d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-locale-rails (2.0.5-5) unstable; urgency=low
+
+  * Oh, bummer: Didn't check that liblocale-ruby (upon which we depend)
+    does not provide a dummy binary package - We have to depend on
+    either 1.8 or 1.9.1 explicitly
+
+ -- Gunnar Wolf <gwolf at debian.org>  Fri, 02 Sep 2011 05:55:01 -0500
+
 ruby-locale-rails (2.0.5-4) unstable; urgency=low
 
   * Repackaged using the gem2deb infrastructure
diff --git a/debian/control b/debian/control
index 38711dd..8cfccbd 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ XS-Ruby-Versions: all
 Package: ruby-locale-rails
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-locale (>= 2.0.5) | liblocale-ruby (>= 2.0.5)
+Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter, ruby-locale (>= 2.0.5) | liblocale-ruby1.8 (>= 2.0.5) |liblocale-ruby1.9.1 (>= 2.0.5)
 Replaces: liblocale-rails-ruby (<< 2.0.5-4~), liblocale-rails-ruby1.8 (<< 2.0.5-4~)
 Breaks: liblocale-rails-ruby (<< 2.0.5-4~), liblocale-rails-ruby1.8 (<< 2.0.5-4~)
 Provides: liblocale-rails-ruby, liblocale-rails-ruby1.8

-- 
ruby-locale-rails.git