[DRE-commits] [rails] 04/04: debian/patches/relax-dependencies.patch: dropped, not necessary anymore

[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 29429ec3bad274fac4a9dc3dc8cae5069d4eb263
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Fri Sep 26 16:04:18 2014 -0300

    debian/patches/relax-dependencies.patch: dropped, not necessary anymore
---
 debian/changelog                        |  1 +
 debian/patches/relax-dependencies.patch | 16 ----------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c75c109..8a3e5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rails (2:4.1.6-1) unstable; urgency=medium
 
   * New upstream release
+  * debian/patches/relax-dependencies.patch: dropped, not necessary anymore
 
  -- Antonio Terceiro <terceiro at debian.org>  Fri, 26 Sep 2014 15:59:24 -0300
 
diff --git a/debian/patches/relax-dependencies.patch b/debian/patches/relax-dependencies.patch
deleted file mode 100644
index 997dc8d..0000000
--- a/debian/patches/relax-dependencies.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 6d4e1b2..d2bcd8a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 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