[DRE-commits] [SCM] ruby-actionmailer-2.3.git branch, master, updated. debian/2.3.14-2-4-gb50ff38

[Paul van Tilburg]

The following commit has been merged in the master branch:
commit 720d3d773fd3cd5ef92255e1ea7968987d224dd8
Author: Paul van Tilburg <paulvt at debian.org>
Date:   Fri Jun 29 19:50:20 2012 +0200

    Bumped the gem2deb build-dep and standards-version; dropped alternative lib*-ruby deps

diff --git a/debian/changelog b/debian/changelog
index 3015b0d..b0bcff5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ruby-actionmailer-2.3 (2.3.14-3) UNRELEASED; urgency=low
+
+  * Team upload.
+  * debian/control.in:
+    - Bumped standards-version to 3.9.3.
+    - Bumped build-dependency on gem2deb to >= 0.3.0~.
+    - Dropped unneeded alternative depends on lib*-ruby packages.
+    - Changed conflicts into breaks.
+
+ -- Paul van Tilburg <paulvt at debian.org>  Fri, 29 Jun 2012 19:49:51 +0200
+
 ruby-actionmailer-2.3 (2.3.14-2) unstable; urgency=low
 
   * Add dependency on ruby-tmail
diff --git a/debian/control.in b/debian/control.in
index ad2c84b..d9350be 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,12 +5,12 @@ Maintainer: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers at lists.al
 Uploaders: Ondřej Surý <ondrej at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 7.0.50~),
-	       gem2deb (>= 0.2.3~),
+	       gem2deb (>= 0.3.0~),
 	       ruby-tmail (>= 1.2.7~),
 	       ruby-actionpack-2.3 (>= @RAILS_VERSION@),
 	       ruby-actionpack-2.3 (<< @RAILS_VERSION at .),
-	       ruby-text-format (>= 0.6.3~) | libtext-format-ruby (>= 0.6.3~)
-Standards-Version: 3.9.2
+	       ruby-text-format (>= 0.6.3~)
+Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer-2.3.git
 Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-actionmailer-2.3.git
 Homepage: http://www.rubyonrails.org
@@ -24,10 +24,10 @@ Depends: ${shlibs:Depends},
 	 ruby | ruby-interpreter,
 	 ruby-actionpack-2.3 (>= @RAILS_VERSION@),
 	 ruby-actionpack-2.3 (<< @RAILS_VERSION at .1),
-	 ruby-text-format | libtext-format-ruby (>= 0.6.3~),
+	 ruby-text-format (>= 0.6.3~),
 	 ruby-tmail (>= 1.2.7~)
 Replaces: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
-Conflicts: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
+Breaks: libactionmailer-ruby (<< 2.3.11-1~), libactionmailer-ruby1.8 (<< 2.3.11-1~)
 Provides: libactionmailer-ruby, libactionmailer-ruby1.8
 Description: Framework for generation of customized email messages
  Action Mailer is a framework for designing email-service layers. These layers

-- 
ruby-actionmailer-2.3.git