[DRE-commits] [SCM] ruby-actionmailer-3.2.git branch, master, updated. debian/3.2.6-2-33-g44a82b6

[Ondřej Surý]

The following commit has been merged in the master branch:
commit 44a82b6d6c19356648a6bf4f586831b08191217f
Merge: 556547b2d690c0eb2a3694a6b6979e513c9de462 fe44dc4676b7430267142235aca392ab2ba14767
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 29 10:58:29 2013 +0200

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

diff --combined debian/control
index a168b04,93003e2..218790d
--- a/debian/control
+++ b/debian/control
@@@ -5,14 -5,12 +5,12 @@@ Maintainer: Debian Ruby Extras Maintain
  Uploaders:
  	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~),
- 	       ruby-actionpack-3.2 (>= 3.2.6),
- 	       ruby-actionpack-3.2 (<< 3.2.6.),
- 	       ruby-mail (>= 2.4.4)
++	       gem2deb (>= 0.3.0~)
  Standards-Version: 3.9.3
- Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-actionmailer-3.2.git
- Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-actionmailer-3.2.git;a=summary
+ Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer-3.2.git
+ Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-actionmailer-3.2.git;a=summary
  Homepage: http://www.rubyonrails.org
  XS-Ruby-Versions: all
  
@@@ -22,8 -20,10 +20,10 @@@ XB-Ruby-Versions: ${ruby:Versions
  Depends: ${shlibs:Depends},
  	 ${misc:Depends},
  	 ruby | ruby-interpreter,
- 	 ruby-actionpack-3.2 (>= 3.2.6),
- 	 ruby-actionpack-3.2 (<< 3.2.6.1),
+ 	 ruby-actionpack-3.2 (>= 3.2.13),
+ 	 ruby-activemodel-3.2 (>= 3.2.13),
+ 	 ruby-activesupport-3.2 (>= 3.2.13),
+ 	 ruby-activerecord-3.2 (>= 3.2.13),
  	 ruby-mail (>= 2.4.4~)
  Conflicts: ruby-actionmailer-2.3
  Description: email composition, delivery, and receiving framework (part of Rails)
diff --combined debian/control.in
index a05ac81,ec03530..8c983fa
--- a/debian/control.in
+++ b/debian/control.in
@@@ -7,10 -7,7 +7,7 @@@ Uploaders
  	Antonio Terceiro <terceiro at debian.org>,
  DM-Upload-Allowed: yes
  Build-Depends: debhelper (>= 7.0.50~),
--	       gem2deb (>= 0.3.0~),
- 	       ruby-actionpack-3.2 (>= @RAILS_VERSION@),
- 	       ruby-actionpack-3.2 (<< @RAILS_VERSION at .),
- 	       ruby-mail (>= 2.4.4)
++	       gem2deb (>= 0.3.0~)
  Standards-Version: 3.9.3
  Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer-3.2.git
  Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-actionmailer-3.2.git;a=summary
@@@ -24,7 -21,9 +21,9 @@@ Depends: ${shlibs:Depends}
  	 ${misc:Depends},
  	 ruby | ruby-interpreter,
  	 ruby-actionpack-3.2 (>= @RAILS_VERSION@),
- 	 ruby-actionpack-3.2 (<< @RAILS_VERSION at .1),
+ 	 ruby-activemodel-3.2 (>= @RAILS_VERSION@),
+ 	 ruby-activesupport-3.2 (>= @RAILS_VERSION@),
+ 	 ruby-activerecord-3.2 (>= @RAILS_VERSION@),
  	 ruby-mail (>= 2.4.4~)
  Conflicts: ruby-actionmailer-2.3
  Description: email composition, delivery, and receiving framework (part of Rails)

-- 
ruby-actionmailer-3.2.git