[DRE-commits] [SCM] ruby-activemodel-3.2.git branch, master, updated. debian/3.2.6-3-32-ge34da9f

[Ondřej Surý]

The following commit has been merged in the master branch:
commit e34da9fd56f82e427cff1f4612561e953c232e81
Merge: 8953b53fc83ac577c4161975686be9f312dd1a01 aa34ae7f5343c53dbd71d153252b44b1d1e5fd90
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon May 27 10:47:26 2013 +0200

    Merge branch 'master-experimental'
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index 5392c06,95752aa..c927bf3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,48 +1,54 @@@
+ ruby-activemodel-3.2 (3.2.13-4) unstable; urgency=low
+ 
+   * Upload to unstable.
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 23 May 2013 10:51:42 +0200
+ 
+ ruby-activemodel-3.2 (3.2.13-3) experimental; urgency=low
+ 
+   * Remove all unneeded ruby/rails build dependencies
+   * Drop ${shlib:Depends}.
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Fri, 22 Mar 2013 14:19:40 +0100
+ 
+ ruby-activemodel-3.2 (3.2.13-2) experimental; urgency=low
+ 
+   * Loosen install time dependencies to allow faster builds.
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 21 Mar 2013 15:11:23 +0100
+ 
+ ruby-activemodel-3.2 (3.2.13-1) unstable; urgency=low
+ 
+   * Imported Upstream version 3.2.13
+   * Update debian/control to rails release 3.2.13
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 19 Mar 2013 10:09:12 +0100
+ 
+ ruby-activemodel-3.2 (3.2.12-1) unstable; urgency=low
+ 
+   * Imported Upstream version 3.2.12
+   * Update debian/control to rails release 3.2.12
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 12 Feb 2013 17:28:08 +0100
+ 
+ ruby-activemodel-3.2 (3.2.11-1) unstable; urgency=low
+ 
+   * Imported Upstream version 3.2.11
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 15 Jan 2013 14:34:16 +0100
+ 
+ ruby-activemodel-3.2 (3.2.8-1) unstable; urgency=low
+ 
+   * Imported Upstream version 3.2.8
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 11 Oct 2012 13:01:43 +0200
+ 
 +ruby-activemodel-3.2 (3.2.6-3) unstable; urgency=low
 +
 +  * Fix circumvention of attr_protected [CVE-2013-0276]
 +
 + -- Ondřej Surý <ondrej at debian.org>  Tue, 12 Feb 2013 16:58:09 +0100
 +
  ruby-activemodel-3.2 (3.2.6-2) unstable; urgency=low
  
    * Bump build dependency on gem2deb to >- 0.3.0~
diff --combined debian/control
index ca7a1f1,84de63a..87672f5
--- a/debian/control
+++ b/debian/control
@@@ -3,27 -3,24 +3,23 @@@ Section: rub
  Priority: optional
  Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
  Uploaders:
- 	Ondřej Surý <ondrej at sury.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~),
- 	       ruby-activesupport-3.2 (>= 3.2.6),
- 	       ruby-activesupport-3.2 (<< 3.2.6.),
- 	       ruby-builder (>= 3.0.0)
+ 	       gem2deb (>= 0.3.0~)
  Standards-Version: 3.9.3
 -Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activemodel-3.2.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activemodel-3.2.git;a=summary
 +Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-activemodel-3.2.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-activemodel-3.2.git;a=summary
  Homepage: http://www.rubyonrails.org
  XS-Ruby-Versions: all
  
  Package: ruby-activemodel-3.2
  Architecture: all
  XB-Ruby-Versions: ${ruby:Versions}
- Depends: ${shlibs:Depends},
- 	 ${misc:Depends},
+ Depends: ${misc:Depends},
  	 ruby | ruby-interpreter,
- 	 ruby-activesupport-3.2 (>= 3.2.6),
- 	 ruby-activesupport-3.2 (<< 3.2.6.)
+ 	 ruby-builder (>= 3.0.0),
+ 	 ruby-activesupport-3.2 (>= 3.2.13)
  Suggests: ruby-bcrypt (>= 3.0.0)
  Description: toolkit for building modeling frameworks (part of Rails)
   Active Model is a toolkit for building modeling frameworks like

-- 
ruby-activemodel-3.2.git