[SCM] ruby-netcdf branch, master, updated. debian/0.6.5-2-12-g7c52e40

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 18ccfa671836ae39c34ec7a32adf81882750a4b2
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Wed Feb 22 17:54:24 2012 +0900

    Update patches: for gbp-pq
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/ChangeNArrayDir b/debian/patches/ChangeNArrayDir
deleted file mode 100644
index e2be0f8..0000000
--- a/debian/patches/ChangeNArrayDir
+++ /dev/null
@@ -1,12 +0,0 @@
---- ruby-netcdf.orig/extconf.rb
-+++ ruby-netcdf/extconf.rb
-@@ -1,7 +1,7 @@
- require "mkmf"
- 
--dir_config('narray',$sitearchdir,$sitearchdir)
--dir_config('netcdf','/usr/local')
-+dir_config('narray',$archdir,$archdir)
-+dir_config('netcdf','/usr/')
- 
- if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
- print <<EOS
diff --git a/debian/patches/ChangeTestPath b/debian/patches/ChangeTestPath
deleted file mode 100644
index b887c40..0000000
--- a/debian/patches/ChangeTestPath
+++ /dev/null
@@ -1,35 +0,0 @@
---- ruby-netcdf-0.6.5.orig/extconf.rb
-+++ ruby-netcdf-0.6.5/extconf.rb
-@@ -108,12 +108,11 @@ oldmkfl.each_line{ |line|
-    case(line)
-    when /^distclean:/
-       newmkfl.puts(line)
-+      newmkfl.puts("\t\t@$(RM) -fr test-lib")
-       newmkfl.puts("\t\t@$(RM) *.nc demo/*.nc demo/*~ lib/*~ doc/*~ test/*.nc test/*~ Makefile.orig")
-    when /^all:/
-       newmkfl.puts(line)
--      newmkfl.puts("")         
--      newmkfl.puts("test: all")            # insert the "test" target
--      newmkfl.puts("\t\t at cd test && ruby test.rb && echo 'test did not fail :-p (please ignore the warnings)' && cd ..") 
-+      newmkfl.puts("\t\t-@( [ ! -d test-lib ] && (mkdir -p test-lib/numru && cd test-lib/numru && ln -s ../../netcdfraw.so && ln -s ../../lib/*.rb . ))")
-    when /lib\/netcdf/
-       line = line.chomp! + "/"
-       newmkfl.puts(line)
---- ruby-netcdf-0.6.5.orig/test/test.rb
-+++ ruby-netcdf-0.6.5/test/test.rb
-@@ -1,13 +1,9 @@
--##require 'numru/netcdf' 
--## // to test before make install -->
- require 'narray'
--require '../netcdfraw'  
--require '../lib/netcdf'
--## <-- to test before make install //
-+require 'numru/netcdf'
- 
- include NumRu
- 
--filename = "test.nc"
-+filename = "test/test.nc"
- print "creating ",filename,"...\n"
- file=NetCDF.create(filename,false,false)
- 
diff --git a/debian/patches/series b/debian/patches/series
index 20cb10a..ae3070c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-ChangeNArrayDir
-ChangeTestPath
+0001-Change-NArray-Directory-for-Debian-s-Ruby-vendor-lib.patch
+0002-ChangeTestPath.patch

-- 
Ruby interface of NetCDF library