[DRE-commits] [SCM] ruby-activeldap.git branch, master, updated. acc077e22e78914983669abc02be17027f8bae22

[=?UTF-8?Q?Marc=20Dequ=C3=A8nes=20?=(Duck)]

The following commit has been merged in the master branch:
commit acc077e22e78914983669abc02be17027f8bae22
Author: Marc Dequènes (Duck) <Duck at DuckCorp.org>
Date:   Sun Sep 11 17:01:51 2011 +0200

    [evol] updated remaining depends (working around liblocale-ruby and libldap-ruby not using the new packaging style yet)

diff --git a/debian/changelog b/debian/changelog
index 4c82538..8568860 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,4 @@
-ruby-activeldap (1.2.4-1) UNRELEASED; urgency=low
-
-TODO: work or wait for gem2deb conversions:
-  - liblocale-ruby1.8
-  - libgettext-activerecord-ruby
+ruby-activeldap (1.2.4-1) unstable; urgency=low
 
   * New upstream release.
   * Switched to gem2deb packaging style.
@@ -12,7 +8,7 @@ TODO: work or wait for gem2deb conversions:
   * Removed patch 'bad_shebang' integrated upstream.
   * Converted copyright file to DEP5 and updated content.
 
- -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Mon, 18 Jul 2011 13:30:58 +0200
+ -- Marc Dequènes (Duck) <Duck at DuckCorp.org>  Sun, 11 Sep 2011 17:01:39 +0200
 
 activeldap (1.2.2-1) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 00f0c97..dd92029 100644
--- a/debian/control
+++ b/debian/control
@@ -16,8 +16,7 @@ XS-Ruby-Versions: all
 Package: ruby-activeldap
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
-# activerecord (~> 2.3.11), locale (= 2.0.5), fast_gettext (= 0.5.8), gettext_i18n_rails (= 0.2.2), rubyforge (>= 2.0.4, development), hoe (>= 2.6.1, development)
-Depends: ${misc:Depends}, ruby | ruby-interpreter, libldap-ruby1.8 (>= 0.8.2), ruby-activesupport-2.3 (>= 2.3.5), ruby-activerecord-2.3 (>= 2.3.5), liblocale-ruby1.8 (>= 2.0.5), libgettext-activerecord-ruby (>= 2.1.0)
+Depends: ${misc:Depends}, ruby | ruby-interpreter, ruby-ldap (>= 0.8.2) | libldap-ruby1.8 (>= 0.8.2), ruby-activesupport-2.3 (>= 2.3.5), ruby-activerecord-2.3 (>= 2.3.5), ruby-locale (>= 2.0.5) | liblocale-ruby1.8 (>= 2.0.5) | liblocale-ruby1.9.1 (>= 2.0.5), ruby-gettext-activerecord (>= 2.1.0)
 Replaces: libactiveldap-ruby (<< 1.2.4-1~), libactiveldap-ruby1.8 (<< 1.2.4-1~)
 Breaks: libactiveldap-ruby (<< 1.2.4-1~), libactiveldap-ruby1.8 (<< 1.2.4-1~)
 Provides: libactiveldap-ruby, libactiveldap-ruby1.8

-- 
ruby-activeldap.git