[ruby-netcdf] 03/08: Refresh patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-netcdf.

commit 9e65025cde91818f078ca3fb6f3f50d968b7bf6e
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Sep 28 15:55:51 2016 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 debian/patches/0002-Support-NetCDF-rc-release                  |  4 +---
 .../0003-Add-patch-Replace-git-execution-from-gemspec.patch    | 10 ++++------
 debian/patches/0004-Fix-spelling-error-in-binary.patch         |  6 ++----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/debian/patches/0002-Support-NetCDF-rc-release b/debian/patches/0002-Support-NetCDF-rc-release
index 21d03a6..59d78ab 100644
--- a/debian/patches/0002-Support-NetCDF-rc-release
+++ b/debian/patches/0002-Support-NetCDF-rc-release
@@ -9,11 +9,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  ext/numru/extconf.rb | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/ext/numru/extconf.rb b/ext/numru/extconf.rb
-index 1ad8b17..e62a9e5 100644
 --- a/ext/numru/extconf.rb
 +++ b/ext/numru/extconf.rb
-@@ -51,7 +51,7 @@ end
+@@ -51,7 +51,7 @@
  
  ncver0 = ncversion[0..0]  # "3" or "4"
  ncver = ncversion.gsub(/\./,'')
diff --git a/debian/patches/0003-Add-patch-Replace-git-execution-from-gemspec.patch b/debian/patches/0003-Add-patch-Replace-git-execution-from-gemspec.patch
index bb4724d..2023534 100644
--- a/debian/patches/0003-Add-patch-Replace-git-execution-from-gemspec.patch
+++ b/debian/patches/0003-Add-patch-Replace-git-execution-from-gemspec.patch
@@ -7,16 +7,14 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  ruby-netcdf.gemspec | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/ruby-netcdf.gemspec b/ruby-netcdf.gemspec
-index 3886c35..06b2bb4 100644
 --- a/ruby-netcdf.gemspec
 +++ b/ruby-netcdf.gemspec
-@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
+@@ -16,7 +16,7 @@
    spec.homepage         = 'http://www.gfd-dennou.org/arch/ruby/products/ruby-netcdf/'
-   spec.licenses         = ["GFD Dennou Club"]
+   spec.licenses         = ["BSD-2-Clause"]
  
 -  spec.files         = `git ls-files -z`.split("\x0")
 +  spec.files         = [".gitignore",".rspec",".travis.yml","ChangeLog","Gemfile","INSTALL","LICENSE.txt","Rakefile","ToDo","bin/console","bin/setup","demo/README","demo/demo1-create-alt.rb","demo/demo1-create.rb","demo/demo2-graphic.rb","demo/demo3-ncepclim.rb","demo/demo4-copy.rb","demo/demo5-netcdf4.rb","doc/README_JP.txt","doc/Ref_man.html","doc/Ref_man.rd","doc/Ref_man_jp.html","doc/Ref_man_jp.rd","doc/to_html","extconf.rb","lib/netcdf.rb","lib/netcdf_miss.rb","lib/version.rb","met [...]
    spec.test_files    = spec.files.grep(%r{^(test|demo)/})
-   #spec.bindir        = "exe"
-   #spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+   spec.require_paths = ["ext","lib"]
+   spec.extensions << "ext/numru/extconf.rb"
diff --git a/debian/patches/0004-Fix-spelling-error-in-binary.patch b/debian/patches/0004-Fix-spelling-error-in-binary.patch
index 18aa928..d8429c3 100644
--- a/debian/patches/0004-Fix-spelling-error-in-binary.patch
+++ b/debian/patches/0004-Fix-spelling-error-in-binary.patch
@@ -7,11 +7,9 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
  ext/numru/netcdfraw.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/ext/numru/netcdfraw.c b/ext/numru/netcdfraw.c
-index 200e8f3..bd2fc6c 100644
 --- a/ext/numru/netcdfraw.c
 +++ b/ext/numru/netcdfraw.c
-@@ -635,7 +635,7 @@ NetCDF_put_att_char(int ncid, char *name,VALUE value,VALUE atttype, int varid)
+@@ -635,7 +635,7 @@
  	}
      } else if (TYPE(atttype) != T_NIL) {
  	rb_raise(rb_eNetcdfError,
@@ -20,7 +18,7 @@ index 200e8f3..bd2fc6c 100644
      }
      /* put value */
      Check_Type(value,T_STRING);
-@@ -807,7 +807,7 @@ NetCDF_def_var(VALUE file,VALUE var_name,VALUE vartype,VALUE dimensions)
+@@ -807,7 +807,7 @@
        xtype = natypecode2nctype(NUM2INT(vartype));     
    } else {
        rb_raise(rb_eNetcdfError,

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