[DRE-commits] [ruby-mpi] 02/03: Refresh patches
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Wed Jul 9 09:23:00 UTC 2014
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository ruby-mpi.
commit 505d94db2eaf8068e1b06d72a9869aefcae9f8cc
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Wed Jul 9 18:02:34 2014 +0900
Refresh patches
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
debian/changelog | 8 ++++
debian/patches/0001-Fix-NArray-PATH.patch | 37 +++++++++++++++
debian/patches/0001-FixNArrayPATH.patch | 29 ------------
debian/patches/0002-Drop-RubyGems-Depends.patch | 20 ++++++++
debian/patches/0002-DropRubygemsDepends.patch | 18 --------
.../0003-Fix-spec-test-loader-for-Debianize.patch | 53 ++++++++++++++++++++++
debian/patches/0003-add_spec_helper_require.patch | 18 --------
debian/patches/series | 6 +--
8 files changed, 121 insertions(+), 68 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 839ff6b..b53c9d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ruby-mpi (0.3.0-1~1.gbp69ed6b) UNRELEASED; urgency=medium
+
+ ** SNAPSHOT build @69ed6b48110e6f939ed52d6271ce8c3b5ee8b1b6 **
+
+ * Imported Upstream version 0.3.0
+
+ -- Youhei SASAKI <uwabami at gfd-dennou.org> Wed, 25 Jun 2014 20:44:27 +0900
+
ruby-mpi (0.2.0-1) unstable; urgency=medium
* Initial release (Closes: #741506)
diff --git a/debian/patches/0001-Fix-NArray-PATH.patch b/debian/patches/0001-Fix-NArray-PATH.patch
new file mode 100644
index 0000000..fef879b
--- /dev/null
+++ b/debian/patches/0001-Fix-NArray-PATH.patch
@@ -0,0 +1,37 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Wed, 9 Jul 2014 18:04:07 +0900
+Subject: Fix NArray PATH
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ ext/mpi/extconf.rb | 20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
+
+--- ruby-mpi.orig/ext/mpi/extconf.rb
++++ ruby-mpi/ext/mpi/extconf.rb
+@@ -1,23 +1,7 @@
+ require "mkmf"
+
+ CONFIG['CC'] = "mpicc"
+-gem_path = nil
+-begin
+- require "rubygems"
+- if Gem::Specification.respond_to?(:find_by_name)
+- if spec = Gem::Specification.find_by_name("narray")
+- gem_path = spec.full_gem_path
+- end
+- else
+- if (spec = Gem.source_index.find_name("narray")).any?
+- gem_path = spec.full_gem_path
+- end
+- end
+-rescue LoadError
+- dir_config("narray", Config::CONFIG["sitearchdir"])
+-end
+-unless find_header("narray.h", gem_path)
+- find_header("narray.h", File.join(gem_path,"src"))
+-end
++dir_config("narray", RbConfig::CONFIG["vendorarchdir"])
++find_header("narray.h", RbConfig::CONFIG["vendorarchdir"])
+
+ create_makefile("mpi")
diff --git a/debian/patches/0001-FixNArrayPATH.patch b/debian/patches/0001-FixNArrayPATH.patch
deleted file mode 100644
index 4192246..0000000
--- a/debian/patches/0001-FixNArrayPATH.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Thu, 13 Mar 2014 15:37:14 +0900
-Subject: FixNArrayPATH
-
----
- ext/mpi/extconf.rb | 12 ++----------
- 1 file changed, 2 insertions(+), 10 deletions(-)
-
---- ruby-mpi.orig/ext/mpi/extconf.rb
-+++ ruby-mpi/ext/mpi/extconf.rb
-@@ -1,15 +1,7 @@
- require "mkmf"
-
- CONFIG['CC'] = "mpicc"
--gem_path = nil
--begin
-- require "rubygems"
-- if (spec = Gem.source_index.find_name("narray")).any?
-- gem_path = spec.last.full_gem_path
-- end
--rescue LoadError
-- dir_config("narray", Config::CONFIG["sitearchdir"])
--end
--find_header("narray.h", gem_path)
-+dir_config("narray", Config::CONFIG["vendorarchdir"])
-+find_header("narray.h", Config::CONFIG["vendorarchdir"])
-
- create_makefile("mpi")
diff --git a/debian/patches/0002-Drop-RubyGems-Depends.patch b/debian/patches/0002-Drop-RubyGems-Depends.patch
new file mode 100644
index 0000000..7553430
--- /dev/null
+++ b/debian/patches/0002-Drop-RubyGems-Depends.patch
@@ -0,0 +1,20 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Wed, 9 Jul 2014 18:04:58 +0900
+Subject: Drop RubyGems Depends
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ lib/mpi.rb | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/lib/mpi.rb b/lib/mpi.rb
+index 2c0695a..1c52a7a 100644
+--- a/lib/mpi.rb
++++ b/lib/mpi.rb
+@@ -1,6 +1,2 @@
+-begin
+- require "rubygems"
+-rescue LoadError
+-end
+ require "narray"
+ require "mpi.so"
diff --git a/debian/patches/0002-DropRubygemsDepends.patch b/debian/patches/0002-DropRubygemsDepends.patch
deleted file mode 100644
index 8fe70e8..0000000
--- a/debian/patches/0002-DropRubygemsDepends.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Thu, 13 Mar 2014 15:37:14 +0900
-Subject: DropRubygemsDepends
-
----
- lib/mpi.rb | 4 ----
- 1 file changed, 4 deletions(-)
-
---- ruby-mpi.orig/lib/mpi.rb
-+++ ruby-mpi/lib/mpi.rb
-@@ -1,6 +1,2 @@
--begin
-- require "rubygems"
--rescue LoadError
--end
- require "narray"
- require "mpi.so"
diff --git a/debian/patches/0003-Fix-spec-test-loader-for-Debianize.patch b/debian/patches/0003-Fix-spec-test-loader-for-Debianize.patch
new file mode 100644
index 0000000..07b9ae1
--- /dev/null
+++ b/debian/patches/0003-Fix-spec-test-loader-for-Debianize.patch
@@ -0,0 +1,53 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Wed, 9 Jul 2014 18:07:53 +0900
+Subject: Fix spec/test loader for Debianize
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ spec/ruby-mpi_spec.rb | 3 ++-
+ spec/spec_helper.rb | 13 -------------
+ test/test_utils.rb | 2 --
+ 3 files changed, 2 insertions(+), 16 deletions(-)
+ delete mode 100644 spec/spec_helper.rb
+
+diff --git a/spec/ruby-mpi_spec.rb b/spec/ruby-mpi_spec.rb
+index c194500..44ac524 100644
+--- a/spec/ruby-mpi_spec.rb
++++ b/spec/ruby-mpi_spec.rb
+@@ -1,4 +1,5 @@
+-require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
++require 'rspec'
++require 'mpi'
+
+ describe "MPI" do
+ before(:all) do
+diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
+deleted file mode 100644
+index 489f71d..0000000
+--- a/spec/spec_helper.rb
++++ /dev/null
+@@ -1,13 +0,0 @@
+-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'ext', 'mpi'))
+-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+-$LOAD_PATH.unshift(File.dirname(__FILE__))
+-require 'rspec'
+-require 'mpi'
+-
+-# Requires supporting files with custom matchers and macros, etc,
+-# in ./support/ and its subdirectories.
+-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+-
+-RSpec.configure do |config|
+-
+-end
+diff --git a/test/test_utils.rb b/test/test_utils.rb
+index c8785d1..49c8b1c 100644
+--- a/test/test_utils.rb
++++ b/test/test_utils.rb
+@@ -1,6 +1,4 @@
+ require "test/unit"
+-
+-$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+ require "mpi/utils"
+
+ class TestMPIUtils < Test::Unit::TestCase
diff --git a/debian/patches/0003-add_spec_helper_require.patch b/debian/patches/0003-add_spec_helper_require.patch
deleted file mode 100644
index 5b73e93..0000000
--- a/debian/patches/0003-add_spec_helper_require.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Debian Ruby Extras Maintainers
- <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
-Date: Thu, 13 Mar 2014 15:37:14 +0900
-Subject: add_spec_helper_require
-
----
- spec/ruby-mpi_spec.rb | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- ruby-mpi.orig/spec/ruby-mpi_spec.rb
-+++ ruby-mpi/spec/ruby-mpi_spec.rb
-@@ -1,4 +1,5 @@
--require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-+require 'rspec'
-+require 'mpi'
-
- describe "MPI" do
- before(:all) do
diff --git a/debian/patches/series b/debian/patches/series
index 574a9b4..3bacdcf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-0001-FixNArrayPATH.patch
-0002-DropRubygemsDepends.patch
-0003-add_spec_helper_require.patch
+0001-Fix-NArray-PATH.patch
+0002-Drop-RubyGems-Depends.patch
+0003-Fix-spec-test-loader-for-Debianize.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-mpi.git
More information about the Pkg-ruby-extras-commits
mailing list