[DRE-commits] [rails] 01/02: ruby-actionmailer: relax dependency on ruby-mail

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master
in repository rails.

commit 4b581ac122913a6af92b095879a3e3b0ec549620
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Aug 4 10:46:05 2014 -0300

    ruby-actionmailer: relax dependency on ruby-mail
---
 debian/changelog                        |  7 +++++++
 debian/patches/relax-dependencies.patch | 16 ++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7f3cf21..84fa408 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+rails (2:4.1.4-5) UNRELEASED; urgency=medium
+
+  * ruby-actionmailer: relax dependency on ruby-mail to work with the 2.6.x
+    series
+
+ -- Antonio Terceiro <terceiro at debian.org>  Mon, 04 Aug 2014 10:45:05 -0300
+
 rails (2:4.1.4-4) unstable; urgency=medium
 
   * ruby-rails:
diff --git a/debian/patches/relax-dependencies.patch b/debian/patches/relax-dependencies.patch
new file mode 100644
index 0000000..997dc8d
--- /dev/null
+++ b/debian/patches/relax-dependencies.patch
@@ -0,0 +1,16 @@
+Description: relax dependencies
+ In Debian we will sometimes have dependencies that are newer than the ones
+ specified in the rails gemspecs. When reasonable, we will relax the
+ dependencies to allow using those versions
+Author: Antonio Terceiro <terceiro at debian.org>
+Forwarded: not-needed
+
+--- rails-4.1.4.orig/actionmailer/actionmailer.gemspec
++++ rails-4.1.4/actionmailer/actionmailer.gemspec
+@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
+   s.add_dependency 'actionpack', version
+   s.add_dependency 'actionview', version
+ 
+-  s.add_dependency 'mail', '~> 2.5.4'
++  s.add_dependency 'mail', '~> 2.5'
+ end
diff --git a/debian/patches/series b/debian/patches/series
index d2bcd8a..6d4e1b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 be-carefull-with-that-bundler.patch
+relax-dependencies.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rails.git