[DRE-commits] [SCM] ruby-activesupport-2.3.git branch, master, updated. debian/2.3.14-2-3-gbddabb4

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 72dc352a387dc5a77be173de435aab09a018908d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Sun Jan 22 11:04:00 2012 +0100

    Remove alternate dependencies from Build-Depends, they don't work with sbuild anyway (Closes: #655817)

diff --git a/debian/control b/debian/control
index 87e67fd..a70f3da 100644
--- a/debian/control
+++ b/debian/control
@@ -6,10 +6,10 @@ Uploaders: Ondřej Surý <ondrej at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
 	       gem2deb (>= 0.2.3~),
-	       ruby-builder (>= 2.1.2~) | libbuilder-ruby (>= 2.1.2~),
-	       libi18n-ruby (>= 0.4.1~) | ruby-i18n (>= 0.4.1~),
-	       libmemcache-client-ruby (>= 1.7.4~) | ruby-memcache-client (>= 1.7.4~),
-	       libtzinfo-ruby (>= 0.3.12~) | ruby-tzinfo (>= 0.3.12~)
+	       ruby-builder (>= 2.1.2~),
+	       libi18n-ruby (>= 0.4.1~),
+	       libmemcache-client-ruby (>= 1.7.4~),
+	       libtzinfo-ruby (>= 0.3.12~)
 Standards-Version: 3.9.2
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activesupport-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activesupport-2.3.git

-- 
ruby-activesupport-2.3.git