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

[Ondřej Surý]

The following commit has been merged in the master branch:
commit eda7ff0579dfd2995e1e19282d425843f71386f5
Author: Ondřej Surý <ondrej at sury.org>
Date:   Wed Jun 1 16:26:21 2011 +0200

    Package renamed from ruby-actionmailer to ruby-actionmailer-2.3

diff --git a/debian/control b/debian/control
index 6d73c8a..479a236 100644
--- a/debian/control
+++ b/debian/control
@@ -1,23 +1,27 @@
-Source: ruby-actionmailer
+Source: ruby-actionmailer-2.3
 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>, Adam Majer <adamm at zombino.com>
+Uploaders: Ondřej Surý <ondrej at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7.0.50~), gem2deb (>= 0.2.3~), ruby-tmail (>= 1.2.7~), ruby-actionpack (>= ${source:Version}~), ruby-text-format (>= 0.6.3~) | libtext-format-ruby (>= 0.6.3~)
+Build-Depends: debhelper (>= 7.0.50~),
+	       gem2deb (>= 0.2.3~),
+	       ruby-tmail (>= 1.2.7~),
+	       ruby-actionpack-2.3,
+	       ruby-text-format (>= 0.6.3~) | libtext-format-ruby (>= 0.6.3~)
 Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/pkg-ruby-extras/ruby-actionmailer.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ruby-extras/ruby-actionmailer.git
+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
 XS-Ruby-Versions: all
 
-Package: ruby-actionmailer
+Package: ruby-actionmailer-2.3
 Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ruby | ruby-interpreter,
-	 ruby-actionpack (>= ${source:Version}~),
+	 ruby-actionpack-2.3 (>= ${source:Version}~), ruby-actionpack-2.3 (<< ${source:Version}.1~),
 	 ruby-text-format | libtext-format-ruby (>= 0.6.3~)
 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~)
@@ -27,19 +31,3 @@ Description: Framework for generation of customized email messages
  are used to consolidate code for sending out forgotten passwords, welcome
  wishes on signup, invoices for billing, and any other use case that requires
  a written notification to either a person or another system.
-
-Package: libactionmailer-ruby
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends}, ruby-actionmailer
-Description: Transitional package for ruby-actionmailer
- This is a transitional package to ease upgrades to the ruby-actionmailer
- package. It can safely be removed.
-
-Package: libactionmailer-ruby1.8
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends}, ruby-actionmailer
-Description: Transitional package for ruby-actionmailer
- This is a transitional package to ease upgrades to the ruby-actionmailer
- package. It can safely be removed.
diff --git a/debian/ruby-actionmailer-2.3.docs b/debian/ruby-actionmailer-2.3.docs
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/debian/ruby-actionmailer-2.3.docs
@@ -0,0 +1 @@
+README
diff --git a/debian/ruby-actionmailer.docs b/debian/ruby-actionmailer.docs
deleted file mode 100644
index 786a9ba..0000000
--- a/debian/ruby-actionmailer.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-# FIXME: READMEs found
-# README

-- 
ruby-actionmailer-2.3.git