[DRE-commits] [rake] 04/15: Refresh patches
Antonio Terceiro
terceiro at moszumanska.debian.org
Fri Jun 30 21:12:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
terceiro pushed a commit to branch master
in repository rake.
commit e9146e4ee787dc205fefe1cbdf610d5205af7012
Author: Antonio Terceiro <terceiro at debian.org>
Date: Wed Jun 28 20:04:54 2017 -0300
Refresh patches
---
debian/changelog | 1 +
debian/patches/0001-remove_rubygems.patch | 26 -------------
...st-helper-adapt-to-test-installed-package.patch | 34 +++++++++++++++++
...sk-never-include-I-usr-lib-ruby-vendor_ru.patch | 39 +++++++++++++++++++
debian/patches/autopkgtest.patch | 25 ------------
debian/patches/series | 6 +--
debian/patches/skip-rake-libdir.patch | 44 ----------------------
debian/patches/skip_permission_test.patch | 22 -----------
8 files changed, 76 insertions(+), 121 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index eed011f..f779906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ rake (12.0.0-1) UNRELEASED; urgency=medium
* debian/watch, debian/copyright: pull from ruby/rake on Github
* New upstream release
+ * Refresh patches
-- Antonio Terceiro <terceiro at debian.org> Tue, 27 Jun 2017 18:03:11 -0300
diff --git a/debian/patches/0001-remove_rubygems.patch b/debian/patches/0001-remove_rubygems.patch
deleted file mode 100644
index 11417ea..0000000
--- a/debian/patches/0001-remove_rubygems.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c6408410db046a22f0a8157e04cb5cb76ac5e32d Mon Sep 17 00:00:00 2001
-From: Antonio Terceiro <terceiro at debian.org>
-Date: Sat, 19 Nov 2011 18:06:57 -0200
-Subject: [PATCH] Remove `require 'rubygems'`
-
----
- bin/rake | 6 ------
- lib/rake/rdoctask.rb | 5 +----
- test/helper.rb | 5 -----
- 3 files changed, 1 insertions(+), 15 deletions(-)
-
---- a/bin/rake
-+++ b/bin/rake
-@@ -22,12 +22,6 @@
- # IN THE SOFTWARE.
- #++
-
--begin
-- require 'rubygems'
-- gem 'rake'
--rescue LoadError
--end
--
- require 'rake'
-
- Rake.application.run
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
new file mode 100644
index 0000000..0a9632f
--- /dev/null
+++ b/debian/patches/0001-test-helper-adapt-to-test-installed-package.patch
@@ -0,0 +1,34 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Tue, 27 Jun 2017 18:11:53 -0300
+Subject: test/helper: adapt to test installed package
+
+These changes are necessary to run under Debian's autopkgtest, which is
+supposed to test the installed package (as opposed to testing the code
+in a source code checkout)
+---
+ test/helper.rb | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/test/helper.rb b/test/helper.rb
+index 7736da7..30d38a4 100644
+--- a/test/helper.rb
++++ b/test/helper.rb
+@@ -26,9 +26,15 @@ class Rake::TestCase < Minitest::Test
+ @verbose = ENV["VERBOSE"]
+
+ @rake_root = File.expand_path "../../", __FILE__
+- @rake_exec = File.join @rake_root, "exe", "rake"
+- @rake_lib = File.join @rake_root, "lib"
+- @ruby_options = ["-I#{@rake_lib}", "-I."]
++ if ENV['ADTTMP']
++ @ruby_exec = '/usr/bin/rake'
++ @rake_lib = '/usr/lib/ruby/vendor_ruby'
++ @ruby_options = []
++ else
++ @rake_exec = File.join @rake_root, "exe", "rake"
++ @rake_lib = File.join @rake_root, "lib"
++ @ruby_options = ["-I#{@rake_lib}", "-I."]
++ end
+
+ @orig_pwd = Dir.pwd
+ @orig_appdata = ENV["APPDATA"]
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
new file mode 100644
index 0000000..96ccc8a
--- /dev/null
+++ b/debian/patches/0002-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch
@@ -0,0 +1,39 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Tue, 27 Jun 2017 18:13:51 -0300
+Subject: rake/testtask: never include -I/usr/lib/ruby/vendor_ruby
+
+---
+ lib/rake/testtask.rb | 7 +------
+ test/test_rake_test_task.rb | 1 +
+ 2 files changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
+index bb7f0ee..f0f2ded 100644
+--- a/lib/rake/testtask.rb
++++ b/lib/rake/testtask.rb
+@@ -197,12 +197,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:
+diff --git a/test/test_rake_test_task.rb b/test/test_rake_test_task.rb
+index 8e422f1..c778ca2 100644
+--- a/test/test_rake_test_task.rb
++++ b/test/test_rake_test_task.rb
+@@ -119,6 +119,7 @@ class TestRakeTestTask < Rake::TestCase
+ end
+
+ def test_run_code_rake
++ skip # disabled in Debian
+ spec = Gem::Specification.new "rake", 0
+ spec.loaded_from = File.join Gem::Specification.dirs.last, "rake-0.gemspec"
+ rake, Gem.loaded_specs["rake"] = Gem.loaded_specs["rake"], spec
diff --git a/debian/patches/autopkgtest.patch b/debian/patches/autopkgtest.patch
deleted file mode 100644
index fd5952c..0000000
--- a/debian/patches/autopkgtest.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: support as-installed tests
- When running tests with autopkgtest, don't try to load files from the source
- package.
-Author: Antonio Terceiro <terceiro at debian.org>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/helper.rb
-+++ b/test/helper.rb
-@@ -49,8 +49,13 @@ class Rake::TestCase < Minitest::Test
- @verbose = ENV['VERBOSE']
-
- @rake_exec = File.join @rake_root, 'bin', 'rake'
-- @rake_lib = File.join @rake_root, 'lib'
-- @ruby_options = ["-I#{@rake_lib}", "-I."]
-+ if ENV['ADTTMP']
-+ @rake_lib = '/usr/lib/ruby/vendor_ruby'
-+ @ruby_options = []
-+ else
-+ @rake_lib = File.join @rake_root, 'lib'
-+ @ruby_options = ["-I#{@rake_lib}", "-I."]
-+ end
-
- @orig_pwd = Dir.pwd
- @orig_appdata = ENV['APPDATA']
diff --git a/debian/patches/series b/debian/patches/series
index ac7d38a..2470288 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-0001-remove_rubygems.patch
-skip_permission_test.patch
-autopkgtest.patch
-skip-rake-libdir.patch
+0001-test-helper-adapt-to-test-installed-package.patch
+0002-rake-testtask-never-include-I-usr-lib-ruby-vendor_ru.patch
diff --git a/debian/patches/skip-rake-libdir.patch b/debian/patches/skip-rake-libdir.patch
deleted file mode 100644
index 8dec54d..0000000
--- a/debian/patches/skip-rake-libdir.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-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:
---- a/test/test_rake_test_task.rb
-+++ b/test/test_rake_test_task.rb
-@@ -82,20 +82,6 @@ class TestRakeTestTask < Rake::TestCase
- assert_equal '-e "ARGV.each{|f| require f}"', test_task.run_code
- end
-
-- def test_run_code_rake
-- spec = Gem::Specification.new 'rake', 0
-- spec.loaded_from = File.join Gem::Specification.dirs.last, 'rake-0.gemspec'
-- rake, Gem.loaded_specs['rake'] = Gem.loaded_specs['rake'], spec
--
-- test_task = Rake::TestTask.new do |t|
-- t.loader = :rake
-- end
--
-- assert_match(/\A-I".*?" ".*?"\Z/, test_task.run_code)
-- ensure
-- Gem.loaded_specs['rake'] = rake
-- end
--
- def test_run_code_rake_default_gem
- skip 'this ruby does not have default gems' unless
- Gem::Specification.method_defined? :default_specifications_dir
diff --git a/debian/patches/skip_permission_test.patch b/debian/patches/skip_permission_test.patch
deleted file mode 100644
index 9073508..0000000
--- a/debian/patches/skip_permission_test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: skip test that is doomed to fail under fakeroot
- This test assumes a given file cannot be deleted after being chmod'd to 000,
- but under fakeroot the system will go ahead and delete the file no matter
- what.
- .
- This patch is most probably Debian-specific.
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/test/test_rake_clean.rb
-+++ b/test/test_rake_clean.rb
-@@ -11,7 +11,7 @@ class TestRakeClean < Rake::TestCase
- "Clobber should require clean"
- end
-
-- def test_cleanup
-+ def skip_under_fakeroot__test_cleanup
- file_name = create_undeletable_file
-
- out, _ = capture_io do
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/rake.git
More information about the Pkg-ruby-extras-commits
mailing list