[DRE-commits] [SCM] ruby-activesupport-3.2.git branch, master, updated. debian/3.2.6-1-2-g5b40afc

[Antonio Terceiro]

The following commit has been merged in the master branch:
commit 5b40afcf66a13b7cc830c8c2db3c2f527d70129c
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Jun 15 23:43:04 2012 -0300

    Conflict with ruby-activesupport-2.3 + add myself to uploaders

diff --git a/debian/changelog b/debian/changelog
index 388d421..f2f40be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-activesupport-3.2 (3.2.6-2) UNRELEASED; urgency=low
+
+  * Conflict with ruby-activesupport-2.3.
+  * debian/control: add myself to Uploaders:
+
+ -- Antonio Terceiro <terceiro at debian.org>  Fri, 15 Jun 2012 23:41:56 -0300
+
 ruby-activesupport-3.2 (3.2.6-1) unstable; urgency=low
 
   * Imported Upstream version 3.2.6
diff --git a/debian/control b/debian/control
index 151a901..a119d04 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: ruby-activesupport-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~),
@@ -22,6 +24,7 @@ Depends: ${shlibs:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-i18n (>= 0.6~),
 	 ruby-multi-json (>= 1.0~)
+Conflicts: ruby-activesupport-2.3
 Description: Support and utility classes used by the Rails 3.2 framework
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be
diff --git a/debian/control.in b/debian/control.in
index 59e09fa..a119d04 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: ruby-activesupport-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~),
@@ -22,7 +24,8 @@ Depends: ${shlibs:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-i18n (>= 0.6~),
 	 ruby-multi-json (>= 1.0~)
-Description: Support and utility classes used by the Rails 2.3 framework
+Conflicts: ruby-activesupport-2.3
+Description: Support and utility classes used by the Rails 3.2 framework
  ActiveSupport consists of utility classes and extensions to the Ruby
  standard library that were required for Rails but found to be
  generally useful.

-- 
ruby-activesupport-3.2.git