[DRE-commits] [SCM] rails-2.3.git branch, master, updated. debian/2.3.14-2-6-ga8340a4

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 46c70166bc3e48c952f93e2504edddf96b34e4ca
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 19:55:54 2012 +0200

    Auto-update debian/control

diff --git a/debian/control b/debian/control
index ed9632d..ae7d624 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Ondřej Surý <ondrej at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
-	       gem2deb (>= 0.2.3~),
+	       gem2deb (>= 0.3.0~),
 	       rake (>= 0.8.3),
 	       ruby-activesupport-2.3 (>= 2.3.14),
 	       ruby-activesupport-2.3 (<< 2.3.14.1),
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 7.0.50~),
 	       ruby-actionmailer-2.3 (<< 2.3.14.1),
 	       ruby-activeresource-2.3 (>= 2.3.14),
 	       ruby-activeresource-2.3 (<< 2.3.14.1)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-rails-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-rails-2.3.git;a=summary
 Homepage: http://www.rubyonrails.org
@@ -30,7 +30,6 @@ Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
 	 rake (>= 0.8.3),
-	 rubygems (>= 1.3.2),
 	 ruby-activesupport-2.3 (>= 2.3.14),
 	 ruby-activesupport-2.3 (<< 2.3.14.1),
 	 ruby-activerecord-2.3 (>= 2.3.14),
@@ -40,10 +39,8 @@ Depends: ${shlibs:Depends},
 	 ruby-actionmailer-2.3 (>= 2.3.14),
 	 ruby-actionmailer-2.3 (<< 2.3.14.1),
 	 ruby-activeresource-2.3 (>= 2.3.14),
-	 ruby-activeresource-2.3 (<< 2.3.14.1),
-	 libjs-prototype,
-	 libjs-scriptaculous
-Conflicts: rails-ruby1.8 (<< 2.3.11-1~)
+	 ruby-activeresource-2.3 (<< 2.3.14.1)
+Breaks: rails-ruby1.8 (<< 2.3.11-1~)
 Replaces: rails-ruby1.8 (<< 2.3.11-1~)
 Provides: rails-ruby1.8
 Description: MVC ruby based framework geared for web application development

-- 
rails-2.3.git