[ruby-hdfeos5] 02/04: Refresh patches
Youhei SASAKI
uwabami-guest at moszumanska.debian.org
Fri Sep 4 05:59:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
uwabami-guest pushed a commit to branch master
in repository ruby-hdfeos5.
commit 686d924b3c63746cc15794ebcc934ee2ffaddd8f
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date: Fri Sep 4 14:56:50 2015 +0900
Refresh patches
Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
debian/patches/0001-Fix-NArray-Library-Path.patch | 16 +++--
debian/patches/0003-Fix-printf-debugging.patch | 78 +++++++++++++----------
debian/patches/0004-hdf5-dir.patch | 18 ++++--
3 files changed, 66 insertions(+), 46 deletions(-)
diff --git a/debian/patches/0001-Fix-NArray-Library-Path.patch b/debian/patches/0001-Fix-NArray-Library-Path.patch
index d8e59b5..e3fea47 100644
--- a/debian/patches/0001-Fix-NArray-Library-Path.patch
+++ b/debian/patches/0001-Fix-NArray-Library-Path.patch
@@ -5,11 +5,13 @@ Subject: Fix NArray Library Path
In Debian, NArray was installed $vendorarchdir.
This patch fix search path for NArray.
---
- extconf.rb | 18 +++++++++++++-----
- 1 file changed, 13 insertions(+), 5 deletions(-)
+ extconf.rb | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
---- ruby-hdfeos5.orig/extconf.rb
-+++ ruby-hdfeos5/extconf.rb
+diff --git a/extconf.rb b/extconf.rb
+index 7cceae4..af5aea9 100644
+--- a/extconf.rb
++++ b/extconf.rb
@@ -1,6 +1,10 @@
require "mkmf"
@@ -22,7 +24,7 @@ This patch fix search path for NArray.
if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
print <<EOS
-@@ -14,7 +18,15 @@
+@@ -14,7 +18,15 @@ EOS
exit(-1)
end
@@ -39,7 +41,7 @@ This patch fix search path for NArray.
if ( ! ( have_header("hdf5.h") && have_library("hdf5") ) )then
print <<-EOS
-@@ -32,9 +44,9 @@
+@@ -32,9 +44,9 @@ if ( ! ( have_header("hdf5.h") && have_library("hdf5") ) )then
exit(-1)
end
@@ -51,7 +53,7 @@ This patch fix search path for NArray.
print <<-EOS
** configure error **
Header hdfeos5.h or the compiled hdfeos5 library is not found.
-@@ -69,7 +81,7 @@
+@@ -69,7 +81,7 @@ oldmkfl.each_line{ |line|
newmkfl.puts(line)
newmkfl.puts("")
newmkfl.puts("test: all") # insert the "test" target
diff --git a/debian/patches/0003-Fix-printf-debugging.patch b/debian/patches/0003-Fix-printf-debugging.patch
index 611aff0..e34841d 100644
--- a/debian/patches/0003-Fix-printf-debugging.patch
+++ b/debian/patches/0003-Fix-printf-debugging.patch
@@ -10,8 +10,10 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
test/test_za.rb | 67 +++++++++++++------------
4 files changed, 235 insertions(+), 232 deletions(-)
---- ruby-hdfeos5.orig/test/test_gd.rb
-+++ ruby-hdfeos5/test/test_gd.rb
+diff --git a/test/test_gd.rb b/test/test_gd.rb
+index b797dc8..b8672f9 100644
+--- a/test/test_gd.rb
++++ b/test/test_gd.rb
@@ -1,69 +1,69 @@
+# -*- coding: utf-8 -*-
require 'numru/hdfeos5'
@@ -117,7 +119,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
dname1.grid.close
-@@ -73,7 +73,7 @@
+@@ -73,7 +73,7 @@ dname1.grid.close
##### he5_gd_setup.c
############################################################################### OK
filename1 = "test_gd.he5"
@@ -126,7 +128,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file1=HE5.open(filename1,"w")
uplft = [210584.50041, 322395.95445]
-@@ -109,7 +109,7 @@
+@@ -109,7 +109,7 @@ file2.close
############################################################################### OK
##### he5_gd_defunlimfld.c he5_sw_definefields.c
############################################################################### OK
@@ -135,7 +137,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file2=HE5.open(filename1,"a")
tilerank = 2
-@@ -118,7 +118,7 @@
+@@ -118,7 +118,7 @@ compparm = [ 8, 0, 0, 0, 0]
grid2=file2.grid("UTMGrid")
grid2.def_var("Pollution", "sfloat", "Time,YDim,XDim")
fillvalue2 = -7.0
@@ -144,7 +146,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
grid2.deftile("HE5_HDFE_TILE", tilerank, tiledims)
grid2.defcomp("HE5_HDFE_COMP_DEFLATE", compparm)
grid2.def_var("Vegetation", "sfloat", "YDim,XDim")
-@@ -130,12 +130,12 @@
+@@ -130,12 +130,12 @@ grid2.def_var("Pressure", "sfloat", "YDim,XDim")
grid2.def_var("Soil Dryness", "sfloat", "YDim,XDim")
grid2.def_var("Spectra", "float", "Bands,YDim,XDim")
fillvalue2 = -9999.0
@@ -160,7 +162,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file3=HE5.open(filename1,"a")
grid3=file3.grid("UTMGrid")
dname1=grid3.var("Vegetation")
-@@ -170,55 +170,55 @@
+@@ -170,55 +170,55 @@ grid3.close
############################################################################### OK
##### he5_gd_info.c
############################################################################### OK
@@ -242,7 +244,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file6=HE5.open(filename1,"r")
grid61=file6.grid("UTMGrid")
grid62=file6.grid("PolarGrid")
-@@ -226,20 +226,20 @@
+@@ -226,20 +226,20 @@ dname1=grid61.var("Vegetation")
start= [0,0]
edge = [200,120]
@@ -270,8 +272,10 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
#cornerlon[0] = 0.0
#cornerlon[1] = 90.0
#cornerlat[1] = 0.0
---- ruby-hdfeos5.orig/test/test_pt.rb
-+++ ruby-hdfeos5/test/test_pt.rb
+diff --git a/test/test_pt.rb b/test/test_pt.rb
+index 9ff9fdc..a5c311c 100644
+--- a/test/test_pt.rb
++++ b/test/test_pt.rb
@@ -1,16 +1,17 @@
+# -*- coding: utf-8 -*-
require 'numru/hdfeos5'
@@ -292,7 +296,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file1=HE5.open(filename1,"w")
point1=file1.ptcreate("Simple point")
point2=file1.ptcreate("FixedBuoy point")
-@@ -23,7 +24,7 @@
+@@ -23,7 +24,7 @@ file1.close
############################################################################### ok
# sample 2
############################################################################### OK
@@ -301,7 +305,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file2=HE5.open(filename1,"a")
point4=file2.point("Simple point")
-@@ -94,7 +95,7 @@
+@@ -94,7 +95,7 @@ file2.close
############################################################################### ok
# sample 3
############################################################################### OK
@@ -310,7 +314,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file3=HE5.open(filename1,"a")
point7=file2.point("Simple point")
dname1=point7.var("Time")
-@@ -148,13 +149,13 @@
+@@ -148,13 +149,13 @@ dname1=point8.var("Rainfall")
count =[15]
time = NArray.sfloat(16)
time[] = 0.234
@@ -326,7 +330,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
dname1=point8.var("ID","observations")
count =[15]
-@@ -167,7 +168,7 @@
+@@ -167,7 +168,7 @@ attr1 = [1, 2, 3, 4]
point8.writeattr("GlobalAttribute","int",count,attr1)
count = [8]
@@ -335,7 +339,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
point8.writeattr("GLOBAL_CHAR_ATTR","char",count,attr1)
count = [3]
attr1 = "abc"
-@@ -188,73 +189,73 @@
+@@ -188,73 +189,73 @@ file3.close
############################################################################### OK
# sample 4
############################################################################### OK
@@ -451,8 +455,10 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file5=HE5.open(filename1,"a")
point8=file5.point("FixedBuoy point")
dname1=point8.var("Latitude")
---- ruby-hdfeos5.orig/test/test_sw.rb
-+++ ruby-hdfeos5/test/test_sw.rb
+diff --git a/test/test_sw.rb b/test/test_sw.rb
+index 246bd9a..b186ec2 100644
+--- a/test/test_sw.rb
++++ b/test/test_sw.rb
@@ -1,83 +1,84 @@
+# -*- coding: utf-8 -*-
require 'numru/hdfeos5'
@@ -578,7 +584,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
dname1.swath.detach
dname1.swath.file.close
-@@ -87,7 +88,7 @@
+@@ -87,7 +88,7 @@ dname1.swath.file.close
##### he5_sw_setup.c
############################################################################### OK
filename1 = "test_sw.he5"
@@ -587,7 +593,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file1=HE5.open(filename1,"w")
swath1=file1.swcreate("Swath1")
-@@ -109,27 +110,27 @@
+@@ -109,27 +110,27 @@ file1.close
############################################################################### ok
##### he5_sw_defunlimfld.c he5_sw_definefields.c
############################################################################### OK
@@ -620,7 +626,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
swath2.defdatafield("Spectra", "Bands,Res2tr,Res2xtr", "NULL", "sfloat", 0)
swath2.defdatafield("Count", "GeoTrack", "NULL", "int", 0);
-@@ -137,9 +138,9 @@
+@@ -137,9 +138,9 @@ swath2.prdefine("Profile-2000", "ProfDim", "NULL", "int")
swath2.detach
file2.close
############################################################################### ok
@@ -632,7 +638,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file3=HE5.open(filename1,"a")
swath3=file3.swath("Swath1")
-@@ -148,21 +149,21 @@
+@@ -148,21 +149,21 @@ start= [0,0]
edge = [-1,-1]
tmp = NArray.float(1,20)
@@ -658,7 +664,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
end
tstart = [0]
-@@ -180,7 +181,7 @@
+@@ -180,7 +181,7 @@ edge = [14,39,19]
tmp = NArray.float(1,40,20)
spectra = tmp * NArray.float(15,1)
spectra[] = 20.0000
@@ -667,7 +673,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
dname1=swath3.var("Spectra")
dname1.writefield(start,nil, edge, spectra,"sfloat")
############################################################################### OK
-@@ -189,12 +190,12 @@
+@@ -189,12 +190,12 @@ attr1 = [1, 2, 3, 4]
swath3.writeattr("GlobalAttribute","int",edge,attr1)
edge[0]=8
@@ -682,7 +688,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
#edge[0]=4
#attr1 = [1111111,2222222,3333333,4444444]
#swath3.writeattr("GLOBAL_LONG_ATTR","H5T_NATIVE_LONG",edge,attr1)
-@@ -221,7 +222,7 @@
+@@ -221,7 +222,7 @@ file3.close
############################################################################### OK
##### he5_sw_wrexternaldata.c
############################################################################### OK
@@ -691,7 +697,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file4=HE5.open(filename1,"a")
swath4=file4.swath("Swath1")
-@@ -233,42 +234,42 @@
+@@ -233,42 +234,42 @@ file4.close
############################################################################### OK
##### he5_sw_info.c
############################################################################### OK
@@ -754,14 +760,16 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
swath6.detach
file6.close
############################################################################### ok
---- ruby-hdfeos5.orig/test/test_za.rb
-+++ ruby-hdfeos5/test/test_za.rb
+diff --git a/test/test_za.rb b/test/test_za.rb
+index 183d5b7..37207cd 100644
+--- a/test/test_za.rb
++++ b/test/test_za.rb
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
require 'numru/hdfeos5'
include NumRu
-@@ -8,7 +9,7 @@
+@@ -8,7 +9,7 @@ include NumRu
##### he5_za_setup.c
############################################################################### OK
filename1 = "test/test_za.he5"
@@ -770,7 +778,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file1=HE5.open(filename1,"w")
za1=file1.zacreate("za1")
-@@ -26,7 +27,7 @@
+@@ -26,7 +27,7 @@ file1.close
############################################################################### ok
##### he5_za_defunlimfld.c he5_za_definefields.c
############################################################################### OK
@@ -779,7 +787,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file2=HE5.open(filename1,"a")
za2=file2.zonal("za1")
za2.def_var("Density", "sfloat", "MyTrack1")
-@@ -34,11 +35,11 @@
+@@ -34,11 +35,11 @@ za2.def_var("Temperature", "sfloat", "MyTrack1,MyTrack2")
za2.def_var("Presure", "float", "Res2tr,Res2xtr")
za2.def_var("Test_string", "text", "MyTrack2")
fillvalue2 = "AAAA"
@@ -793,7 +801,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
za2.define("Spectra", "Bands,Res2tr,Res2xtr", "NULL", "sfloat")
comp_code = "HDFE_COMP_SZIP_K13orEC"
comp_level=[16,0,0,0,0]
-@@ -48,9 +49,9 @@
+@@ -48,9 +49,9 @@ za2.define("Count", "MyTrack1", "NULL", "int")
za2.detach
file2.close
############################################################################### ok
@@ -805,7 +813,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file3=HE5.open(filename1,"a")
za3=file3.zonal("za1")
-@@ -65,7 +66,7 @@
+@@ -65,7 +66,7 @@ edge = [14,39,19]
tmp = NArray.float(1,40,20)
spectra = tmp * NArray.float(15,1)
spectra[] = 20.0000
@@ -814,7 +822,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
dname1=za3.var("Spectra")
dname1.writefield(start,nil, edge, spectra,"sfloat")
############################################################################### OK
-@@ -79,7 +80,7 @@
+@@ -79,7 +80,7 @@ za3.writeattr("GLOBAL_CHAR_ATTR","char",edge,attr1)
edge[0]=3
attr1 = "abc"
za3.writeattr("GLOBAL_CHAR_ATTR_11","char",edge,attr1)
@@ -823,7 +831,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
#edge[0]=4
#attr1 = [1111111,2222222,3333333,4444444]
#za3.writeattr("GLOBAL_LONG_ATTR","long",edge,attr1)
-@@ -98,7 +99,7 @@
+@@ -98,7 +99,7 @@ file3.close
############################################################################### OK
##### he5_za_wrexternaldata.c
############################################################################### OK
@@ -832,7 +840,7 @@ Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
file4=HE5.open(filename1,"a")
za4=file4.zonal("za1")
-@@ -110,47 +111,47 @@
+@@ -110,47 +111,47 @@ file4.close
############################################################################### OK
##### he5_za_info.c
############################################################################### OK
diff --git a/debian/patches/0004-hdf5-dir.patch b/debian/patches/0004-hdf5-dir.patch
index e7aba45..762176e 100644
--- a/debian/patches/0004-hdf5-dir.patch
+++ b/debian/patches/0004-hdf5-dir.patch
@@ -1,3 +1,13 @@
+From: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
+Date: Fri, 4 Sep 2015 14:56:31 +0900
+Subject: hdf5-dir
+
+---
+ extconf.rb | 17 ++++++++++-------
+ 1 file changed, 10 insertions(+), 7 deletions(-)
+
+diff --git a/extconf.rb b/extconf.rb
+index af5aea9..302e06e 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -1,4 +1,7 @@
@@ -8,7 +18,7 @@
require "rbconfig" unless defined? RbConfig
$vendorarchdir=RbConfig::CONFIG['vendorarchdir']
-@@ -8,8 +11,8 @@
+@@ -8,8 +11,8 @@ dir_config('narray',$vendorarchdir,$vendorarchdir)
if ( ! ( have_header("narray.h") && have_header("narray_config.h") ) ) then
print <<EOS
@@ -19,7 +29,7 @@
/narraydir/include, try the following:
% ruby extconf.rb --with-narray-include=/narraydir/include
-@@ -30,8 +33,8 @@
+@@ -30,8 +33,8 @@ dir_config('hdf5',$archlibdir,$archlibdir)
if ( ! ( have_header("hdf5.h") && have_library("hdf5") ) )then
print <<-EOS
@@ -30,7 +40,7 @@
If you have the library installed under /hdf5dir (that is, hdf5.h is
in /hdf5dir/include and the library in /hdf5dir/lib/),
try the following:
-@@ -48,8 +51,8 @@
+@@ -48,8 +51,8 @@ dir_config('hdfeos5','/usr/include/hdf-eos5',$archlibdir)
if ( ! ( have_header("HE5_HdfEosDef.h") && have_library("he5_hdfeos") ) )then
print <<-EOS
@@ -41,7 +51,7 @@
If you have the library installed under /hdfeos5dir (that is, hdfeos5.h is
in /hdfeos5dir/include and the library in /hdfeos5dir/lib/),
try the following:
-@@ -79,7 +82,7 @@
+@@ -79,7 +82,7 @@ oldmkfl.each_line{ |line|
newmkfl.puts("\t\t@$(RM) *.he5 Makefile.orig")
when /^all:/
newmkfl.puts(line)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ruby-hdfeos5.git
More information about the Pkg-grass-devel
mailing list