[DRE-commits] [SCM] ruby-railties-3.2.git branch, master, updated. debian/3.2.6-3-40-gf0b31b0

[Ondřej Surý]

The following commit has been merged in the master branch:
commit f0b31b03665f482285a468cf1efbc20d6471086c
Merge: f4fd8c1e4a65fd275a8f7fe3da04535d97da3550 8704fd9d4bc18156444e2810e09996bd8006d25d
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 29 11:10:39 2013 +0200

    Merge branch 'master-experimental'
    
    Conflicts:
    	debian/control
    	debian/control.in

diff --combined debian/control
index 8c682d2,4672782..67aaa68
--- a/debian/control
+++ b/debian/control
@@@ -3,46 -3,30 +3,31 @@@ Section: rub
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders:
-  Ondřej Surý <ondrej at debian.org>,
-  Antonio Terceiro <terceiro at debian.org>,
+ 	Ondřej Surý <ondrej at debian.org>,
+ 	Antonio Terceiro <terceiro at debian.org>,
+ DM-Upload-Allowed: yes
  Build-Depends: debhelper (>= 7.0.50~),
-  gem2deb (>= 0.3.0~),
-  rake (>= 0.8.7),
-  ruby-thor (>= 0.14.6),
-  ruby-rack-ssl (>= 1.3.2),
-  ruby-activesupport-3.2 (>= 3.2.6),
-  ruby-activesupport-3.2 (<< 3.2.6.),
-  ruby-actionpack-3.2 (>= 3.2.6),
-  ruby-actionpack-3.2 (<< 3.2.6.),
-  ruby-actionmailer-3.2 (>= 3.2.6),
-  ruby-actionmailer-3.2 (<< 3.2.6.),
- Standards-Version: 3.9.3
- Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-railties-3.2.git
- Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-railties-3.2.git;a=summary
+ 	       gem2deb (>= 0.3.0~)
+ Standards-Version: 3.9.4
+ Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-railties-3.2.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-railties-3.2.git;a=summary
  Homepage: http://www.rubyonrails.org
  XS-Ruby-Versions: all
  
  Package: ruby-railties-3.2
  Architecture: all
  XB-Ruby-Versions: ${ruby:Versions}
 -Depends: ${misc:Depends},
 +Depends: ${shlibs:Depends},
-  ${misc:Depends},
-  ruby | ruby-interpreter,
-  rake (>= 0.8.7),
-  ruby-thor (>= 0.14.6),
-  ruby-rack-ssl (>= 1.3.2),
-  ruby-activesupport-3.2 (>= 3.2.6),
-  ruby-activesupport-3.2 (<< 3.2.6.),
-  ruby-actionpack-3.2 (>= 3.2.6),
-  ruby-actionpack-3.2 (<< 3.2.6.),
-  ruby-actionmailer-3.2 (>= 3.2.6),
-  ruby-actionmailer-3.2 (<< 3.2.6.),
- Recommends:
-  ruby-sqlite3,
-  ruby-sass-rails,
-  ruby-coffee-rails,
-  ruby-uglifier,
-  ruby-jquery-rails
++	 ${misc:Depends},
+ 	 ruby | ruby-interpreter,
+ 	 rake (>= 0.8.7),
+ 	 ruby-thor (>= 0.14.6),
+ 	 ruby-rack-ssl (>= 1.3.2),
+ 	 ruby-activesupport-3.2 (>= 3.2.13),
+ 	 ruby-actionpack-3.2 (>= 3.2.13),
+ 	 ruby-actionmailer-3.2 (>= 3.2.13),
+ 	 ruby-activemodel-3.2 (>= 3.2.13),
+ 	 ruby-activeresource-3.2 (>= 3.2.13)
  Conflicts: ruby-rails-2.3, rails (<< 3:3.2.0)
  Description: MVC ruby based framework geared for web application development
   Rails is a full-stack, open-source web framework in Ruby for writing

-- 
ruby-railties-3.2.git