[DRE-commits] [SCM] ruby-actionpack-3.2.git branch, master, updated. debian/3.2.6-6-35-gb200acd

[Ondřej Surý]

The following commit has been merged in the master branch:
commit b200acd7a168227728a7b59d0a0b0835f2e6e4ca
Merge: c3223b0d92c6aefe0dc10ae24c40671e4b4c2eac 42cbe6e70e95e3f6b542d1edaa06c09d5b42a9ee
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed May 29 11:00:58 2013 +0200

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

diff --combined debian/changelog
index 48e67b6,c27de1d..203010e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,57 +1,71 @@@
+ ruby-actionpack-3.2 (3.2.13-5) unstable; urgency=low
+ 
+   * Upload to unstable.
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 23 May 2013 11:10:30 +0200
+ 
+ ruby-actionpack-3.2 (3.2.13-4) experimental; urgency=low
+ 
+   * Remove all unneeded ruby/rails build dependencies, and drop
+     ${shlib:Depends}.
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Fri, 22 Mar 2013 14:28:35 +0100
+ 
+ ruby-actionpack-3.2 (3.2.13-3) experimental; urgency=low
+ 
+   * Loosen install time dependencies to allow faster builds
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 21 Mar 2013 15:15:28 +0100
+ 
+ ruby-actionpack-3.2 (3.2.13-2) unstable; urgency=low
+ 
+   * Pull fix for a speed regression from
+     https://github.com/rails/rails/issues/9803
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Wed, 20 Mar 2013 18:49:16 +0100
+ 
+ ruby-actionpack-3.2 (3.2.13-1) unstable; urgency=low
+ 
+   * Imported Upstream version 3.2.13
+   * Update debian/control to rails release 3.2.13
+   * Update patches for 3.2.13 release
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 19 Mar 2013 10:18:44 +0100
+ 
+ ruby-actionpack-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:39:14 +0100
+ 
+ ruby-actionpack-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:41:49 +0100
+ 
+ ruby-actionpack-3.2 (3.2.8-1) unstable; urgency=low
+ 
+   * Imported Upstream version 3.2.8
+   * Loosen sprockets dependency to ~> 2.1
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Fri, 12 Oct 2012 12:53:20 +0200
+ 
 +ruby-actionpack-3.2 (3.2.6-6) unstable; urgency=high
 +
 +  * [CVE-2013-1855]: Fix XSS vulnerability in sanitize_css in Action Pack
 +  * [CVE-2013-1857]: Fix XSS Vulnerability in the sanitize helper of Ruby on Rails
 +
 + -- Ondřej Surý <ondrej at debian.org>  Tue, 19 Mar 2013 09:45:34 +0100
 +
 +ruby-actionpack-3.2 (3.2.6-5) unstable; urgency=high
 +
 +  * debian/patches/CVE-2013-0155.patch: fix Unsafe Query Generation Risk
 +    [CVE-2013-0155] (Closes: #697802)
 +
 + -- Antonio Terceiro <terceiro at debian.org>  Wed, 09 Jan 2013 18:25:45 -0300
 +
  ruby-actionpack-3.2 (3.2.6-4) unstable; urgency=high
  
    * Add patches for security problems (Closes: #684454):
diff --combined debian/control
index 02d4f05,d7974bd..c976322
--- a/debian/control
+++ b/debian/control
@@@ -5,31 -5,23 +5,22 @@@ 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-activesupport-3.2 (>= 3.2.6),
- 	       ruby-activesupport-3.2 (<< 3.2.6.),
- 	       ruby-activerecord-3.2 (>= 3.2.6),
- 	       ruby-activerecord-3.2 (<< 3.2.6.),
- 	       ruby-rack (>= 1.4.0~)
+ 	       gem2deb (>= 0.3.0~)
  Standards-Version: 3.9.3
 -Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionpack-3.2.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-actionpack-3.2.git;a=summary
 +Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-actionpack-3.2.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-actionpack-3.2.git;a=summary
  Homepage: http://www.rubyonrails.org
  XS-Ruby-Versions: all
  
  Package: ruby-actionpack-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-activemodel-3.2 (>= 3.2.6),
- 	 ruby-activemodel-3.2 (<< 3.2.6.),
- 	 ruby-activerecord-3.2 (>= 3.2.6),
- 	 ruby-activerecord-3.2 (<< 3.2.6.),
+ 	 ruby-activesupport-3.2 (>= 3.2.13),
+ 	 ruby-activemodel-3.2 (>= 3.2.13),
+ 	 ruby-activerecord-3.2 (>= 3.2.13),
  	 ruby-rack-cache (>= 1.2~),
  	 ruby-rack (>= 1.3.0~),
  	 ruby-rack-test (>= 0.6.1~),

-- 
ruby-actionpack-3.2.git