[DRE-commits] [SCM] ruby-activesupport-3.2.git branch, master, updated. debian/3.2.13-1-9-gb0a70df

[Ondřej Surý]

The following commit has been merged in the master branch:
commit b0a70df84c6d604413d0be611119dab2f278a113
Merge: 8245ef7471a7566ad0a0073ac78201413573b13b 56aaef44b8044d192ec2a0a6392f607cdfee3bfa
Author: Ondřej Surý <ondrej at sury.org>
Date:   Mon May 27 10:54:38 2013 +0200

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

diff --combined debian/changelog
index 728434c,d9faeb6..03608dd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,36 +1,50 @@@
+ ruby-activesupport-3.2 (3.2.13-2) unstable; urgency=low
+ 
+   * Upload to unstable.
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 23 May 2013 10:49:53 +0200
+ 
+ ruby-activesupport-3.2 (3.2.13-1) experimental; urgency=low
+ 
+   * Imported Upstream version 3.2.13
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 19 Mar 2013 10:08:42 +0100
+ 
+ ruby-activesupport-3.2 (3.2.12-1) experimental; urgency=low
+ 
+   * Imported Upstream version 3.2.12
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 12 Feb 2013 17:27:38 +0100
+ 
+ ruby-activesupport-3.2 (3.2.11-1) experimental; urgency=low
+ 
+   * Imported Upstream version 3.2.11
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Tue, 15 Jan 2013 14:23:25 +0100
+ 
+ ruby-activesupport-3.2 (3.2.8-1) experimental; urgency=low
+ 
+   * Imported Upstream version 3.2.8
+   * Bump dependency on gem2deb to >= 0.3.0~ in control.in, so it is kept
+     when upstream version changes
+   * Add gpb.conf for experimental branch
+ 
+  -- Ondřej Surý <ondrej at debian.org>  Thu, 11 Oct 2012 12:42:37 +0200
+ 
 +ruby-activesupport-3.2 (3.2.6-6) unstable; urgency=high
 +
 +  * Fix aa735c44 in control.in, so it is kept when upstream version changes
 +  * [CVE-2013-1856]: Fix XML Parsing Vulnerability affecting JRuby users
 +
 + -- Ondřej Surý <ondrej at debian.org>  Tue, 19 Mar 2013 09:46:52 +0100
 +
 +ruby-activesupport-3.2 (3.2.6-5) unstable; urgency=high
 +
 +  * debian/patches/CVE-2013-0156.patch: fix for vulnerabilities in
 +    vulnerabilities in parameter parsing [CVE-2013-0156] (Closes: #697790)
 +
 + -- Antonio Terceiro <terceiro at debian.org>  Wed, 09 Jan 2013 17:23:52 -0300
 +
  ruby-activesupport-3.2 (3.2.6-4) unstable; urgency=high
  
    * debian/patches/CVE-2012-3464.patch: fixes potential XSS vulnerability.
diff --combined debian/control
index 18f7157,f1cb11c..7d35a4e
--- a/debian/control
+++ b/debian/control
@@@ -3,14 -3,16 +3,15 @@@ 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>,
 -DM-Upload-Allowed: yes
  Build-Depends: debhelper (>= 7.0.50~),
  	       gem2deb (>= 0.3.0~),
  	       ruby-i18n (>= 0.6~),
  	       ruby-multi-json (>= 1.0~)
  Standards-Version: 3.9.3
 -Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activesupport-3.2.git
 -Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activesupport-3.2.git;a=summary
 +Vcs-Git: git://anonscm.debian.org/pkg-ruby-extras/ruby-activesupport-3.2.git
 +Vcs-Browser: http://anonscm.debian.org/gitweb?p=pkg-ruby-extras/ruby-activesupport-3.2.git;a=summary
  Homepage: http://www.rubyonrails.org
  XS-Ruby-Versions: all
  

-- 
ruby-activesupport-3.2.git