[DRE-commits] [SCM] ruby-activesupport-3.2.git branch, master, updated. debian/3.2.3-2-5-gd919950

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 9541bb95cacb7427bc8236158b57761258776add
Author: Ondřej Surý <ondrej at sury.org>
Date:   Fri Jun 15 10:37:38 2012 +0200

    Update debian/control for 3.2.6

diff --git a/debian/control b/debian/control
index cee36c8..59e09fa 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,6 @@ Depends: ${shlibs:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-i18n (>= 0.6~),
 	 ruby-multi-json (>= 1.0~)
-Conflicts: ruby-activesupport-2.3
 Description: Support and utility classes used by the Rails 2.3 framework
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be
diff --git a/debian/control.in b/debian/control.in
index 5f32c5f..59e09fa 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -6,7 +6,7 @@ Uploaders: Ondřej Surý <ondrej at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
 	       gem2deb (>= 0.2.13~),
-	       ruby-i18n (>- 0.6~),
+	       ruby-i18n (>= 0.6~),
 	       ruby-multi-json (>= 1.0~)
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activesupport-3.2.git

-- 
ruby-activesupport-3.2.git