[DRE-commits] [rake] 11/15: Fix 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 9d2330bb881902fe909da385d3d20ebad778c5c3
Author: Antonio Terceiro <terceiro at debian.org>
Date: Thu Jun 29 10:23:19 2017 -0300
Fix patches
---
debian/patches/0001-test-helper-adapt-to-test-installed-package.patch | 4 ++--
debian/patches/0003-gemspec-drop-git-usage.patch | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
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 0a9632f..48aef65 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,7 +10,7 @@ in a source code checkout)
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/test/helper.rb b/test/helper.rb
-index 7736da7..30d38a4 100644
+index 7736da7..31bd87e 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -26,9 +26,15 @@ class Rake::TestCase < Minitest::Test
@@ -21,7 +21,7 @@ index 7736da7..30d38a4 100644
- @rake_lib = File.join @rake_root, "lib"
- @ruby_options = ["-I#{@rake_lib}", "-I."]
+ if ENV['ADTTMP']
-+ @ruby_exec = '/usr/bin/rake'
++ @rake_exec = '/usr/bin/rake'
+ @rake_lib = '/usr/lib/ruby/vendor_ruby'
+ @ruby_options = []
+ else
diff --git a/debian/patches/0003-gemspec-drop-git-usage.patch b/debian/patches/0003-gemspec-drop-git-usage.patch
index 4a7291b..634d67a 100644
--- a/debian/patches/0003-gemspec-drop-git-usage.patch
+++ b/debian/patches/0003-gemspec-drop-git-usage.patch
@@ -7,7 +7,7 @@ Subject: gemspec: drop git usage
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/rake.gemspec b/rake.gemspec
-index 8479b93..b3df626 100644
+index 8479b93..220fbb5 100644
--- a/rake.gemspec
+++ b/rake.gemspec
@@ -23,7 +23,7 @@ Rake has the following features:
--
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