[DRE-commits] [SCM] ruby-activerecord-3.2.git branch, master, updated. debian/3.2.3-3-8-g3737867

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit c7c7c4b68b6bdfbc40a30b191532cdd07d9db357
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 16 11:09:18 2012 -0300

    updating to 3.2.6

diff --git a/debian/changelog b/debian/changelog
index 7192e89..145865c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-activerecord-3.2 (3.2.6-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * debian/control:
+    + Add myself to Uploaders:
+    + Conflicty with ruby-activerecord-2.3
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 16 Jun 2012 11:06:14 -0300
+
 ruby-activerecord-3.2 (3.2.3-3) unstable; urgency=low
 
   * Add Conflicts with ruby-activerecord-2.3 (Closes: #673741, #673578)
diff --git a/debian/control b/debian/control
index c220807..e04d4d4 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,16 @@ Source: ruby-activerecord-3.2
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Ondřej Surý <ondrej at 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.2.13~),
-	       ruby-activesupport-3.2 (>= 3.2.3),
-	       ruby-activesupport-3.2 (<< 3.2.3.),
-	       ruby-activemodel-3.2 (>= 3.2.3),
-	       ruby-activemodel-3.2 (<< 3.2.3.)
+	       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.)
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-activerecord-3.2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activerecord-3.2.git;a=summary
@@ -22,10 +24,10 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-activesupport-3.2 (>= 3.2.3),
-	 ruby-activesupport-3.2 (<< 3.2.3.),
-	 ruby-activemodel-3.2 (>= 3.2.3),
-	 ruby-activemodel-3.2 (<< 3.2.3.),
+	 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-arel (>= 3.0.2~),
 	 ruby-tzinfo (>= 0.3.29~)
 Conflicts: ruby-activerecord-2.3
diff --git a/debian/control.in b/debian/control.in
index 38dc57a..796290c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: ruby-activerecord-3.2
 Section: ruby
 Priority: optional
 Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Uploaders: Ondřej Surý <ondrej at 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.2.13~),
@@ -16,7 +18,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activerecord-3.2.git;
 Homepage: http://www.rubyonrails.org
 XS-Ruby-Versions: all
 
-Package: ruby-activerecord
+Package: ruby-activerecord-3.2
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
@@ -28,6 +30,7 @@ Depends: ${shlibs:Depends},
 	 ruby-activemodel-3.2 (<< @RAILS_VERSION at .),
 	 ruby-arel (>= 3.0.2~),
 	 ruby-tzinfo (>= 0.3.29~)
+Conflicts: ruby-activerecord-2.3
 Description: Object-relational mapper framework (part of Rails).
  Active Records is a framework to work with databases on Rails.  Build
  a persistent domain model by mapping database tables to Ruby classes.

-- 
ruby-activerecord-3.2.git