The following commit has been merged in the master branch: commit 17a746c4cce347676a620472b63a90e21f82ec08 Author: Youhei SASAKI <uwab...@gfd-dennou.org> Date: Thu Feb 17 18:32:29 2011 +0900
remove unneeded patch: committed upstream Signed-off-by: Youhei SASAKI <uwab...@gfd-dennou.org> diff --git a/debian/changelog b/debian/changelog index a0ccfc0..e03ec8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -ruby-netcdf (0.6.4-1) unstable; urgency=low +ruby-netcdf (0.6.5-1) unstable; urgency=low * Initial Release (Closes: #542144) diff --git a/debian/patches/ChangeExtconf b/debian/patches/ChangeExtconf deleted file mode 100644 index 16168f9..0000000 --- a/debian/patches/ChangeExtconf +++ /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/SupportRuby1.9.2 b/debian/patches/SupportRuby1.9.2 deleted file mode 100644 index 59a884f..0000000 --- a/debian/patches/SupportRuby1.9.2 +++ /dev/null @@ -1,213 +0,0 @@ ---- ruby-netcdf.orig/ChangeLog -+++ ruby-netcdf/ChangeLog -@@ -1,3 +1,8 @@ -+Mon Dec 13 2010 T Koshiro -+ * netcdfraw.c : patch for Ruby 1.9.2 -+ - by S Kouketsu (dennou-ruby:003191) -+ - by T Koshiro (dennou-ruby:003226) -+ - Mon Mar 15 2010 T Horinouchi - * ruby-netcdf-0.6.4 released (relase tag: ruby-netcdf-0_6_4) - ---- ruby-netcdf.orig/netcdfraw.c -+++ ruby-netcdf/netcdfraw.c -@@ -6,16 +6,22 @@ - - /* for compatibility with ruby 1.6 */ - #ifndef RSTRING_PTR --#define RSTRING_PTR(a) (RSTRING(a)->ptr) -+#define RSTRING_PTR(s) (RSTRING(s)->ptr) - #endif - #ifndef RSTRING_LEN --#define RSTRING_LEN(a) (RSTRING(a)->len) -+#define RSTRING_LEN(s) (RSTRING(s)->len) - #endif - #ifndef RARRAY_PTR --#define RARRAY_PTR(s) (RARRAY(s)->ptr) -+#define RARRAY_PTR(a) (RARRAY(a)->ptr) - #endif - #ifndef RARRAY_LEN --#define RARRAY_LEN(s) (RARRAY(s)->len) -+#define RARRAY_LEN(a) (RARRAY(a)->len) -+#endif -+#ifndef StringValueCStr -+#define StringValueCStr(s) STR2CSTR(s) -+#endif -+#ifndef SafeStringValue -+#define SafeStringValue(s) Check_SafeStr(s) - #endif - - /* Data to NArray */ -@@ -345,7 +351,7 @@ - } - - static VALUE --err_status2class(status) -+err_status2class(int status) - { - if(NC_ISSYSERR(status)){ - return(rb_eNetcdfSyserr); -@@ -425,17 +431,17 @@ - nctype2natype(int nctype){ - switch(nctype){ - case NC_CHAR: -- return("char"); -+ return((char *)"char"); - case NC_BYTE: -- return("byte"); -+ return((char *)"byte"); - case NC_SHORT: -- return("sint"); -+ return((char *)"sint"); - case NC_INT: -- return("int"); -+ return((char *)"int"); - case NC_FLOAT: -- return("sfloat"); -+ return((char *)"sfloat"); - case NC_DOUBLE: -- return("float"); -+ return((char *)"float"); - default: - rb_raise(rb_eNetcdfError, "No such netcdf type number %d\n",nctype); - } -@@ -677,7 +683,7 @@ - ptr = na_val->ptr; - switch(na_typecode){ - case NA_BYTE: -- status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,ptr); -+ status = nc_put_att_uchar(ncid,varid,name,NC_BYTE,len,(unsigned char *)ptr); - break; - case NA_SINT: - status = nc_put_att_short(ncid,varid,name,NC_SHORT,len,(short *)ptr); -@@ -794,7 +800,7 @@ - switch(TYPE(RARRAY_PTR(dimensions)[c_ndims-1-i])){ - case T_STRING: - Check_Type(RARRAY_PTR(dimensions)[c_ndims-1-i],T_STRING); -- c_dim_name=STR2CSTR(RARRAY_PTR(dimensions)[c_ndims-1-i]); -+ c_dim_name=StringValueCStr(RARRAY_PTR(dimensions)[c_ndims-1-i]); - status=nc_inq_dimid(ncid,c_dim_name,&dimidp); - if(status != NC_NOERR) NC_RAISE(status); - c_dimids[i]=dimidp; -@@ -1021,7 +1027,7 @@ - VALUE retval; - - Check_Type(filename,T_STRING); -- Check_SafeStr(filename); -+ SafeStringValue(filename); - c_filename=RSTRING_PTR(filename); - Check_Type(omode,T_FIXNUM); - c_omode=NUM2INT(omode); -@@ -1044,7 +1050,7 @@ - struct Netcdf *ncfile; - - Check_Type(filename,T_STRING); -- Check_SafeStr(filename); -+ SafeStringValue(filename); - c_filename=RSTRING_PTR(filename); - Check_Type(cmode,T_FIXNUM); - c_cmode=NUM2INT(cmode); -@@ -1194,7 +1200,7 @@ - ncid=Netcdf_dim->ncid; - dimid=Netcdf_dim->dimid; - Check_Type(dimension_newname,T_STRING); -- c_dim_name = STR2CSTR(dimension_newname); -+ c_dim_name = StringValueCStr(dimension_newname); - - status = nc_rename_dim(ncid,dimid,c_dim_name); - if(status !=NC_NOERR) NC_RAISE(status); -@@ -1268,19 +1274,17 @@ - Data_Get_Struct(Att,struct NetCDFAtt,Netcdf_att); - ncid=Netcdf_att->ncid; - varid=Netcdf_att->varid; -- c_att_name=ALLOCA_N(char,NC_MAX_NAME); -- c_new_att_name=ALLOC_N(char,NC_MAX_NAME); - - c_att_name=Netcdf_att->name; - - Check_Type(new_att_name,T_STRING); -- Check_SafeStr(new_att_name); -- c_new_att_name=STR2CSTR(new_att_name); -+ SafeStringValue(new_att_name); -+ c_new_att_name=StringValueCStr(new_att_name); - - status = nc_rename_att(ncid,varid,c_att_name,c_new_att_name); - if(status != NC_NOERR) NC_RAISE(status); - -- Netcdf_att->name=c_new_att_name; -+ strcpy(Netcdf_att->name,c_new_att_name); - return Qnil; - } - -@@ -1789,7 +1793,7 @@ - varid=Netcdf_var->varid; - - Check_Type(var_new_name,T_STRING); -- c_var_new_name=STR2CSTR(var_new_name); -+ c_var_new_name=StringValueCStr(var_new_name); - - status = nc_rename_var(ncid,varid,c_var_new_name); - if(status !=NC_NOERR) NC_RAISE(status); -@@ -1815,7 +1819,7 @@ - varid=Netcdf_var->varid; - - Check_Type(att_name,T_STRING); -- c_att_name=STR2CSTR(att_name); -+ c_att_name=StringValueCStr(att_name); - - status = nc_inq_attid(ncid,varid,c_att_name,&c_attnump); - if(status == NC_NOERR){ -@@ -1957,7 +1961,7 @@ - - Cbyte_to_NArray(NArray,ndimsp,shape,ptr); - -- status = nc_get_var_text(ncid,varid,ptr); -+ status = nc_get_var_text(ncid,varid,(char *)ptr); - if(status != NC_NOERR) NC_RAISE(status); - - OBJ_TAINT(NArray); -@@ -2238,7 +2242,7 @@ - - - Cbyte_to_NArray(NArray,ndims,c_count,ptr); -- status = nc_get_var1_text(ncid,varid,c_start,ptr); -+ status = nc_get_var1_text(ncid,varid,c_start,(char *)ptr); - if(status != NC_NOERR) NC_RAISE(status); - - OBJ_TAINT(NArray); -@@ -2645,7 +2649,7 @@ - - Cbyte_to_NArray(NArray,ndims,shape,ptr); - -- status = nc_get_vars_text(ncid,varid,c_start,c_count,c_stride,ptr); -+ status = nc_get_vars_text(ncid,varid,c_start,c_count,c_stride,(char *)ptr); - if(status != NC_NOERR) NC_RAISE(status); - - OBJ_TAINT(NArray); -@@ -3256,7 +3260,7 @@ - if(status != NC_NOERR) NC_RAISE(status ); - rb_raise(rb_eNetcdfError,"Length of NArray don't equal to length of total array in the '%s'\n",var_name); - } -- status = nc_put_var_text(ncid,varid,ptr); -+ status = nc_put_var_text(ncid,varid,(char *)ptr); - if(status !=NC_NOERR) NC_RAISE(status); - return Qnil; - } -@@ -3539,7 +3543,7 @@ - } - Array_to_Cbyte(NArray,ptr); - -- status = nc_put_var1_text(ncid,varid,c_start,ptr); -+ status = nc_put_var1_text(ncid,varid,c_start,(char *)ptr); - if(status != NC_NOERR) NC_RAISE(status); - return Qnil; - } -@@ -3900,7 +3904,7 @@ - } - } - -- status = nc_put_vars_text(ncid,varid,c_start,c_count,c_stride,ptr); -+ status = nc_put_vars_text(ncid,varid,c_start,c_count,c_stride,(char *)ptr); - if(status != NC_NOERR) NC_RAISE(status); - return Qnil; - } diff --git a/debian/patches/cvshead-2010-12-14.patch b/debian/patches/cvshead-2010-12-14.patch deleted file mode 100644 index a689cf4..0000000 --- a/debian/patches/cvshead-2010-12-14.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 894cc625824df55d83b679dc676acb7042fe237d Mon Sep 17 00:00:00 2001 -From: koshiro <koshiro> -Date: Tue, 14 Dec 2010 06:23:00 +0000 -Subject: [PATCH] Tue Dec 14 2010 T Koshiro - * netcdfraw.c : nctype2natype : char* -> const char* - * test/aref_aset.rb, test/factor_offset.rb : bug fix. - ---- - ChangeLog | 4 ++++ - netcdfraw.c | 18 +++++++++--------- - test/aref_aset.rb | 1 + - test/factor_offset.rb | 6 +++--- - 4 files changed, 17 insertions(+), 12 deletions(-) - ---- ruby-netcdf.orig/ChangeLog -+++ ruby-netcdf/ChangeLog -@@ -1,3 +1,7 @@ -+Tue Dec 14 2010 T Koshiro -+ * netcdfraw.c : nctype2natype : char* -> const char* -+ * test/aref_aset.rb, test/factor_offset.rb : bug fix. -+ - Mon Dec 13 2010 T Koshiro - * netcdfraw.c : patch for Ruby 1.9.2 - - by S Kouketsu (dennou-ruby:003191) ---- ruby-netcdf.orig/netcdfraw.c -+++ ruby-netcdf/netcdfraw.c -@@ -427,21 +427,21 @@ - } - } - --static char* -+static const char* - nctype2natype(int nctype){ - switch(nctype){ - case NC_CHAR: -- return((char *)"char"); -+ return("char"); - case NC_BYTE: -- return((char *)"byte"); -+ return("byte"); - case NC_SHORT: -- return((char *)"sint"); -+ return("sint"); - case NC_INT: -- return((char *)"int"); -+ return("int"); - case NC_FLOAT: -- return((char *)"sfloat"); -+ return("sfloat"); - case NC_DOUBLE: -- return((char *)"float"); -+ return("float"); - default: - rb_raise(rb_eNetcdfError, "No such netcdf type number %d\n",nctype); - } -@@ -1476,7 +1476,7 @@ - int varid; - int status; - char *att_name; -- char *Attname; -+ const char *Attname; - struct NetCDFAtt *Netcdf_att; - nc_type xtypep; - -@@ -1710,7 +1710,7 @@ - int varid; - nc_type xtypep; - struct NetCDFVar *Netcdf_var; -- char *Vartype; -+ const char *Vartype; - - Data_Get_Struct(Var,struct NetCDFVar,Netcdf_var); - ---- ruby-netcdf.orig/test/aref_aset.rb -+++ ruby-netcdf/test/aref_aset.rb -@@ -30,6 +30,7 @@ - p '*1*',v[1] - p '*2*',v[3..4],v.rank - p '*3*',v[[2,0,0]] -+vxy = f.var('xy') - p '*4*',vxy[[2,0],[0,2,1]] - p '*5*',vxy[1,[2,0,1]] - p '*6*',vxy[[4,3],2] ---- ruby-netcdf.orig/test/factor_offset.rb -+++ ruby-netcdf/test/factor_offset.rb -@@ -44,10 +44,10 @@ - p v31 - p v32 - --print "** scaled_get type fixed to sfloat\n" --NetCDFVar.scaled_get_type = NArray::SFLOAT -+print "** unpack type fixed to sfloat\n" -+NetCDFVar.unpack_type = NArray::SFLOAT - v33 = v3.scaled_get - p v33 --NetCDFVar.scaled_get_type = NArray::INT -+NetCDFVar.unpack_type = NArray::INT - v33 = v3.scaled_get - p v33 diff --git a/debian/patches/cvshead-2010-12-23.patch b/debian/patches/cvshead-2010-12-23.patch deleted file mode 100644 index 63870b0..0000000 --- a/debian/patches/cvshead-2010-12-23.patch +++ /dev/null @@ -1,65 +0,0 @@ -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 48443aa..20cb10a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,2 @@ -SupportRuby1.9.2 ChangeNArrayDir ChangeTestPath -cvshead-2010-12-14.patch -cvshead-2010-12-23.patch -- Ruby interface of NetCDF library _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel