[DRE-commits] [rails-3.2] 02/02: railties: relax dependency on rdoc, from ~> 3.4 to >= 3.4

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rails-3.2.

commit 309e6326d5f924e7050d711848ba426f8d40a007
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sat Mar 29 14:17:14 2014 -0300

    railties: relax dependency on rdoc, from ~> 3.4 to >= 3.4
---
 debian/changelog                        |  8 ++++++++
 debian/patches/relax-dependencies.patch | 11 +++++++++++
 2 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 34a969c..73c2a8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+rails-3.2 (3.2.17-3) unstable; urgency=medium
+
+  * railties: relax dependency on rdoc from ~> 3.4 to >= 3.4
+    - this will make rails work with newer interpreters (e.g. Ruby 2.0
+      provides rdoc 4.0.0)
+
+ -- Antonio Terceiro <terceiro at debian.org>  Sat, 29 Mar 2014 14:27:24 -0300
+
 rails-3.2 (3.2.17-2) unstable; urgency=medium
 
   * Drop Provides|Conflicts|Replaces agains unversioned packages
diff --git a/debian/patches/relax-dependencies.patch b/debian/patches/relax-dependencies.patch
index 39f383d..bd33665 100644
--- a/debian/patches/relax-dependencies.patch
+++ b/debian/patches/relax-dependencies.patch
@@ -34,3 +34,14 @@
 -  s.add_dependency('builder',       '~> 3.0.0')
 +  s.add_dependency('builder',       '~> 3.0')
  end
+--- a/railties/railties.gemspec
++++ b/railties/railties.gemspec
+@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
+   # Thor is so heavily used by other gems, we will accept Thor's semver guarantee to reduce
+   # the possibility of conflicts.
+   s.add_dependency('thor',          '>= 0.14.6', '< 2.0')
+-  s.add_dependency('rdoc',          '~> 3.4')
++  s.add_dependency('rdoc',          '>= 3.4')
+   s.add_dependency('activesupport', version)
+   s.add_dependency('actionpack',    version)
+ end

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