[DRE-commits] [rake] 03/06: New upstream release + fix rake/testtask

[Antonio Terceiro]

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

terceiro pushed a commit to branch master
in repository rake.

commit b5f9326ca9c1b440d478f301782abf0becfe87e8
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 29 16:55:46 2016 -0300

    New upstream release + fix rake/testtask
---
 debian/changelog                      | 10 ++++++++++
 debian/patches/autopkgtest.patch      |  2 +-
 debian/patches/series                 |  1 +
 debian/patches/skip-rake-libdir.patch | 21 +++++++++++++++++++++
 4 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eef2440..a92f31b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+rake (10.5.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+  * Refresh patches
+  * Add debian/patches/skip-rake-libdir.patch: avoid includingh
+    -I/usr/lib/ruby/vendor_ruby first in $LOAD_PATH, what breaks running tests
+    of ruby-foo if there is another copy of ruby-foo already installed.
+
+ -- Antonio Terceiro <terceiro at debian.org>  Mon, 29 Feb 2016 16:54:29 -0300
+
 rake (10.4.2-2) unstable; urgency=medium
 
   * Fix bash completion
diff --git a/debian/patches/autopkgtest.patch b/debian/patches/autopkgtest.patch
index 0af2ea5..fd5952c 100644
--- a/debian/patches/autopkgtest.patch
+++ b/debian/patches/autopkgtest.patch
@@ -7,7 +7,7 @@ Forwarded: not-needed
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -47,8 +47,13 @@ class Rake::TestCase < MiniTest::Unit::T
+@@ -49,8 +49,13 @@ class Rake::TestCase < Minitest::Test
      @verbose = ENV['VERBOSE']
  
      @rake_exec = File.join @rake_root, 'bin', 'rake'
diff --git a/debian/patches/series b/debian/patches/series
index 4d4a1b2..ac7d38a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0001-remove_rubygems.patch
 skip_permission_test.patch
 autopkgtest.patch
+skip-rake-libdir.patch
diff --git a/debian/patches/skip-rake-libdir.patch b/debian/patches/skip-rake-libdir.patch
new file mode 100644
index 0000000..838f73b
--- /dev/null
+++ b/debian/patches/skip-rake-libdir.patch
@@ -0,0 +1,21 @@
+Description: rake/testtask: never include -I/usr/lib/ruby/vendor_ruby
+Author: Antonio Terceiro
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2016-02-29
+--- a/lib/rake/testtask.rb
++++ b/lib/rake/testtask.rb
+@@ -188,12 +188,7 @@ module Rake
+     end
+ 
+     def rake_include_arg # :nodoc:
+-      spec = Gem.loaded_specs['rake']
+-      if spec.respond_to?(:default_gem?) && spec.default_gem?
+-        ""
+-      else
+-        "-I\"#{rake_lib_dir}\""
+-      end
++      ""
+     end
+ 
+     def rake_lib_dir # :nodoc:

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