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

[Antonio Terceiro]

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

    add changelog entry for 3.2.6-1

diff --git a/debian/changelog b/debian/changelog
index 17fc047..0bcdff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ruby-actionmailer-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 21:33:09 -0300
+
 ruby-actionmailer-3.2 (3.2.3-2) unstable; urgency=low
 
   * Add Conflict with ruby-actionmailer-2.3 (Closes: #673740)
diff --git a/debian/control b/debian/control
index 4ed56e3..670e9f6 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,14 @@ Source: ruby-actionmailer-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.7~),
-	       ruby-actionpack-3.2 (>= 3.2.3),
-	       ruby-actionpack-3.2 (<< 3.2.3.),
+	       ruby-actionpack-3.2 (>= 3.2.6),
+	       ruby-actionpack-3.2 (<< 3.2.6.),
 	       ruby-mail (>= 2.4.4)
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer-3.2.git
@@ -21,11 +23,11 @@ XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-actionpack-3.2 (>= 3.2.3),
-	 ruby-actionpack-3.2 (<< 3.2.3.1),
+	 ruby-actionpack-3.2 (>= 3.2.6),
+	 ruby-actionpack-3.2 (<< 3.2.6.1),
 	 ruby-mail (>= 2.4.4~)
 Conflicts: ruby-actionmailer-2.3
-Description: Email composition, delivery, and receiving framework (part of Rails).
+Description: email composition, delivery, and receiving framework (part of Rails)
  Action Mailer is a framework for working with email on Rails.
  Compose, deliver, receive, and test emails using the familiar
  controller/view pattern.  First-class support for multipart email
diff --git a/debian/control.in b/debian/control.in
index 4f47b84..d98c395 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -2,7 +2,9 @@ Source: ruby-actionmailer-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.7~),
@@ -24,7 +26,8 @@ Depends: ${shlibs:Depends},
 	 ruby-actionpack-3.2 (>= @RAILS_VERSION@),
 	 ruby-actionpack-3.2 (<< @RAILS_VERSION at .1),
 	 ruby-mail (>= 2.4.4~)
-Description: Email composition, delivery, and receiving framework (part of Rails).
+Conflicts: ruby-actionmailer-2.3
+Description: email composition, delivery, and receiving framework (part of Rails)
  Action Mailer is a framework for working with email on Rails.
  Compose, deliver, receive, and test emails using the familiar
  controller/view pattern.  First-class support for multipart email

-- 
ruby-actionmailer-3.2.git