[DRE-commits] [rake] 03/05: Refresh patches

[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 abd37dc6e49931684381f1a5397639a4b1cccbb4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Thu Dec 7 08:56:04 2017 -0200

    Refresh patches
---
 debian/changelog                                               |  1 +
 .../0001-test-helper-adapt-to-test-installed-package.patch     |  4 ++--
 ...-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch |  8 ++++----
 debian/patches/0003-gemspec-drop-git-usage.patch               | 10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1bc39a5..55d72cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 rake (12.3.0-1) UNRELEASED; urgency=medium
 
   * New upstream version 12.3.0
+  * Refresh patches
 
  -- Antonio Terceiro <terceiro at debian.org>  Thu, 07 Dec 2017 08:48:59 -0200
 
diff --git a/debian/patches/0001-test-helper-adapt-to-test-installed-package.patch b/debian/patches/0001-test-helper-adapt-to-test-installed-package.patch
index 48aef65..50a3b80 100644
--- a/debian/patches/0001-test-helper-adapt-to-test-installed-package.patch
+++ b/debian/patches/0001-test-helper-adapt-to-test-installed-package.patch
@@ -10,10 +10,10 @@ in a source code checkout)
  1 file changed, 9 insertions(+), 3 deletions(-)
 
 diff --git a/test/helper.rb b/test/helper.rb
-index 7736da7..31bd87e 100644
+index 949b635..e86aa28 100644
 --- a/test/helper.rb
 +++ b/test/helper.rb
-@@ -26,9 +26,15 @@ class Rake::TestCase < Minitest::Test
+@@ -34,9 +34,15 @@ class Rake::TestCase < Minitest::Test
      @verbose = ENV["VERBOSE"]
  
      @rake_root = File.expand_path "../../", __FILE__
diff --git a/debian/patches/0002-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch b/debian/patches/0002-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch
index 96ccc8a..0faf128 100644
--- a/debian/patches/0002-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch
+++ b/debian/patches/0002-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch
@@ -8,10 +8,10 @@ Subject: rake/testtask: never include -I/usr/lib/ruby/vendor_ruby
  2 files changed, 2 insertions(+), 6 deletions(-)
 
 diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
-index bb7f0ee..f0f2ded 100644
+index 5376275..c031271 100644
 --- a/lib/rake/testtask.rb
 +++ b/lib/rake/testtask.rb
-@@ -197,12 +197,7 @@ module Rake
+@@ -199,12 +199,7 @@ module Rake
      end
  
      def rake_include_arg # :nodoc:
@@ -26,10 +26,10 @@ index bb7f0ee..f0f2ded 100644
  
      def rake_lib_dir # :nodoc:
 diff --git a/test/test_rake_test_task.rb b/test/test_rake_test_task.rb
-index 8e422f1..c778ca2 100644
+index 396e059..d97ea6c 100644
 --- a/test/test_rake_test_task.rb
 +++ b/test/test_rake_test_task.rb
-@@ -119,6 +119,7 @@ class TestRakeTestTask < Rake::TestCase
+@@ -120,6 +120,7 @@ class TestRakeTestTask < Rake::TestCase
    end
  
    def test_run_code_rake
diff --git a/debian/patches/0003-gemspec-drop-git-usage.patch b/debian/patches/0003-gemspec-drop-git-usage.patch
index 634d67a..8568640 100644
--- a/debian/patches/0003-gemspec-drop-git-usage.patch
+++ b/debian/patches/0003-gemspec-drop-git-usage.patch
@@ -7,15 +7,15 @@ Subject: gemspec: drop git usage
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/rake.gemspec b/rake.gemspec
-index 8479b93..220fbb5 100644
+index fa9a5c6..939499c 100644
 --- a/rake.gemspec
 +++ b/rake.gemspec
-@@ -23,7 +23,7 @@ Rake has the following features:
+@@ -24,7 +24,7 @@ Rake has the following features:
    s.homepage = "https://github.com/ruby/rake".freeze
    s.licenses = ["MIT".freeze]
  
--  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-+  s.files = Dir['**/*'].reject { |f| File.directory?(f) || f.match(%r{^(debian|test|spec|features)/}) }
+-  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) } -
++  s.files = Dir['**/*'].reject { |f| File.directory?(f) || f.match(%r{^(debian|test|spec|features)/}) } -
+             %w[.rubocop.yml .travis.yml appveyor.yml]
    s.bindir = "exe"
    s.executables = s.files.grep(%r{^exe/}) { |f| File.basename(f) }
-   s.require_paths = ["lib".freeze]

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