[DRE-commits] [SCM] ruby-activeresource-3.2.git branch, master, updated. debian/3.2.3-2-4-gb6d5763

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 0a9e7f08c30005e089a521f807c973a26508b6e5
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Jun 16 22:27:14 2012 -0300

    open changelog entry for 3.2.6-1

diff --git a/debian/changelog b/debian/changelog
index bf9cb4a..6d4b2a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-activeresource-3.2 (3.2.6-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + add myself to Uploaders:
+    + review short description
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 16 Jun 2012 22:24:03 -0300
+
 ruby-activeresource-3.2 (3.2.3-2) unstable; urgency=low
 
   * Add Conflict with ruby-activeresource-3.2 (Closes: #673742)
diff --git a/debian/control b/debian/control
index d9f2502..3f8edd3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,16 @@ Source: ruby-activeresource-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-activeresource-3.2.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-activeresource-3.2.git;a=summary
@@ -22,12 +24,12 @@ 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.)
 Conflicts: ruby-activeresource-2.3
-Description: REST modeling framework (part of Rails).
+Description: REST modeling framework (part of Rails)
  Active Resource (ARes) connects business objects and Representational
  State Transfer (REST) web services.  It implements object-relational
  mapping for REST webservices to provide transparent proxying
diff --git a/debian/control.in b/debian/control.in
index 6ef1531..f31d0de 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: ruby-activeresource-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~),
@@ -26,7 +28,8 @@ Depends: ${shlibs:Depends},
 	 ruby-activesupport-3.2 (<< @RAILS_VERSION at .),
 	 ruby-activemodel-3.2 (>= @RAILS_VERSION@),
 	 ruby-activemodel-3.2 (<< @RAILS_VERSION at .)
-Description: REST modeling framework (part of Rails).
+Conflicts: ruby-activeresource-2.3
+Description: REST modeling framework (part of Rails)
  Active Resource (ARes) connects business objects and Representational
  State Transfer (REST) web services.  It implements object-relational
  mapping for REST webservices to provide transparent proxying

-- 
ruby-activeresource-3.2.git