[DebianGIS-dev] [SCM] ruby-netcdf branch, master, updated. 2fecb9d7880ea9d5f2f70ee317296d5893b0e1e3

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 2fecb9d7880ea9d5f2f70ee317296d5893b0e1e3
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Dec 24 12:29:11 2010 +0900

    apply CVS head (minor bug fix)
    
    * rename patch

diff --git a/debian/patches/cvshead20101214 b/debian/patches/cvshead-2010-12-14.patch
similarity index 100%
rename from debian/patches/cvshead20101214
rename to debian/patches/cvshead-2010-12-14.patch
diff --git a/debian/patches/cvshead-2010-12-23.patch b/debian/patches/cvshead-2010-12-23.patch
new file mode 100644
index 0000000..63870b0
--- /dev/null
+++ b/debian/patches/cvshead-2010-12-23.patch
@@ -0,0 +1,65 @@
+From 2c1df0de7b282ebe4fc7487d51196a600720507d Mon Sep 17 00:00:00 2001
+From: koshiro <koshiro>
+Date: Wed, 22 Dec 2010 17:51:20 +0000
+Subject: [PATCH] Thu Dec 23  2010  T Koshiro
+         * test/aref_aset.rb : updated for Ruby 1.9.2
+         * lib/netcdf.rb: NetCDF.clean_tmpfile : lambda -> proc
+         * verified that all test programs work fine with Ruby 1.9.2.
+
+---
+ ChangeLog         |    5 +++++
+ lib/netcdf.rb     |    2 +-
+ test/aref_aset.rb |    4 ++--
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index 1404e9f..7350b1e 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++Thu Dec 23  2010  T Koshiro
++	* test/aref_aset.rb : updated for Ruby 1.9.2
++	* lib/netcdf.rb: NetCDF.clean_tmpfile : lambda -> proc
++	* verified that all test programs work fine with Ruby 1.9.2.
++
+ Tue Dec 14  2010  T Koshiro
+ 	* netcdfraw.c : nctype2natype : char* -> const char*
+ 	* test/aref_aset.rb, test/factor_offset.rb : bug fix.
+diff --git a/lib/netcdf.rb b/lib/netcdf.rb
+index 3c26da4..6ff50bf 100644
+--- a/lib/netcdf.rb
++++ b/lib/netcdf.rb
+@@ -70,7 +70,7 @@ module NumRu
+     
+     class << NetCDF
+        def clean_tmpfile(path)
+-	  lambda{
++	  proc {
+ 	     print "removing ", path, "..." if $DEBUG
+ 	     if File.exist?(path)
+ 		File.unlink(path) 
+diff --git a/test/aref_aset.rb b/test/aref_aset.rb
+index 1b63903..4ba3456 100644
+--- a/test/aref_aset.rb
++++ b/test/aref_aset.rb
+@@ -11,7 +11,7 @@ vxy = f.def_var('xy','sfloat',[dx,dy])
+ f.enddef
+ v.put([1,2,3,4,5])
+ p 'testing []= ...'
+-v[{0..3,2}]=[100,500]
++v[{0..3=>2}]=[100,500]
+ v[1]=999
+ v[3..4]=[-99,-99]
+ v2.put(666)
+@@ -26,7 +26,7 @@ f.close
+ f = NetCDF.open(s)
+ v = f.var('x')
+ p 'testing [] ...'
+-p '*0*',v[{0..3,2}]
++p '*0*',v[{0..3=>2}]
+ p '*1*',v[1]
+ p '*2*',v[3..4],v.rank
+ p '*3*',v[[2,0,0]]
+-- 
+1.7.2.3
+
diff --git a/debian/patches/series b/debian/patches/series
index 8010ccc..48443aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 SupportRuby1.9.2
 ChangeNArrayDir
 ChangeTestPath
-cvshead20101214
+cvshead-2010-12-14.patch
+cvshead-2010-12-23.patch

-- 
Ruby interface of NetCDF library