[DRE-commits] [SCM] ruby-actionpack-2.3.git branch, master, updated. debian/2.3.14-3-4-gfc49b5b

[Paul van Tilburg]

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

    Auto-update debian/control

diff --git a/debian/control b/debian/control
index 0f0fd3d..81b99ca 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,13 @@ 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~),
 	       ruby-activesupport-2.3 (>= 2.3.14),
 	       ruby-activesupport-2.3 (<< 2.3.14.1),
 	       ruby-activerecord-2.3 (>= 2.3.14),
 	       ruby-activerecord-2.3 (<< 2.3.14.1),
-	       ruby-rack (>= 1.1.0~) | librack-ruby (>= 1.1.0~)
-Standards-Version: 3.9.2
+	       ruby-rack (>= 1.1.0~)
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionpack-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-actionpack-2.3.git
 Homepage: http://www.rubyonrails.org
@@ -27,8 +27,8 @@ Depends: ${shlibs:Depends},
 	 ruby-activesupport-2.3 (<< 2.3.14.1),
 	 ruby-activerecord-2.3 (>= 2.3.14),
 	 ruby-activerecord-2.3 (<< 2.3.14.1),
-	 ruby-rack (>= 1.1.0~) | librack-ruby (>= 1.1.0~)
-Conflicts: libactionpack-ruby (<< 2.3.11-1~), libactionpack-ruby1.8 (<< 2.3.11-1~)
+	 ruby-rack (>= 1.1.0~)
+Breaks: libactionpack-ruby (<< 2.3.11-1~), libactionpack-ruby1.8 (<< 2.3.11-1~)
 Replaces: libactionpack-ruby (<< 2.3.11-1~), libactionpack-ruby1.8 (<< 2.3.11-1~)
 Provides: libactionpack-ruby, libactionpack-ruby1.8
 Description: Controller and View framework used by Rails

-- 
ruby-actionpack-2.3.git