[SCM] ruby-hdfeos5 branch, master, updated. upstream/1.1-21-g716193a

Youhei SASAKI uwabami at gfd-dennou.org
Thu Jul 4 17:26:57 UTC 2013


The following commit has been merged in the master branch:
commit 1bb210dc8b415be7a2a20cbe84fac76567a4f699
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jul 5 00:56:24 2013 +0900

    Refresh patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/FixLibraryPath b/debian/patches/FixLibraryPath
index dae5cf7..d6b7d93 100644
--- a/debian/patches/FixLibraryPath
+++ b/debian/patches/FixLibraryPath
@@ -4,7 +4,7 @@
  require "mkmf"
  
 -dir_config('narray',$sitearchdir,$sitearchdir)
-+dir_config('narray',$archdir,$archdir)
++dir_config('narray',$vendorarchdir,$vendorarchdir)
  
  if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
  print <<EOS
@@ -37,13 +37,12 @@
    print <<-EOS
      ** configure error **  
         Header hdfeos5.h or the compiled hdfeos5 library is not found. 
-@@ -68,8 +76,7 @@
-    when /^all:/
+@@ -69,7 +77,7 @@
        newmkfl.puts(line)
        newmkfl.puts("")         
--      newmkfl.puts("test: all")            # insert the "test" target
+       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/numru ] && ( mkdir -p test-lib/numru && cd test-lib/numru && ln -s ../../hdfeos5raw.so hdfeos5raw.so && ln -s ../../lib/hdfeos5.rb hdfeos5.rb )) ")
++      newmkfl.puts("\t\t at cd test && ruby test.rb && echo 'test did not fail :-p (please ignore the warnings)' && cd ..")
     else
        newmkfl.puts(line)
     end

-- 
Ruby interface of HDF-EOS5 library



More information about the Pkg-grass-devel mailing list