diff -Nru ruby-hdfeos5-1.2/debian/changelog ruby-hdfeos5-1.2/debian/changelog --- ruby-hdfeos5-1.2/debian/changelog 2016-11-29 17:36:37.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/changelog 2016-12-05 17:43:46.000000000 +0000 @@ -1,8 +1,20 @@ -ruby-hdfeos5 (1.2-6build1) zesty; urgency=medium +ruby-hdfeos5 (1.2-7) unstable; urgency=medium - * Rebuild against new hdf5 + * Team upload. - -- Iain Lane Tue, 29 Nov 2016 17:36:37 +0000 + [ Bas Couwenberg ] + * Fix Vcs-Git URL to use /git instead of /cgit. + * Restructure control file with cme. + * Update watch file to handle common issues. + * Bump Standards-Version to 3.9.8, no changes. + * Enable parallel builds. + * Add patch to fix 'length' typo. + + [ Gilles Filippini ] + * Fix FTBFS on 32 bit architectures against HDF5 1.10. + (closes: #846353) + + -- Bas Couwenberg Mon, 05 Dec 2016 18:43:46 +0100 ruby-hdfeos5 (1.2-6) unstable; urgency=medium diff -Nru ruby-hdfeos5-1.2/debian/control ruby-hdfeos5-1.2/debian/control --- ruby-hdfeos5-1.2/debian/control 2016-03-01 09:16:23.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/control 2016-12-02 14:41:14.000000000 +0000 @@ -1,20 +1,26 @@ Source: ruby-hdfeos5 -Section: ruby -Priority: optional Maintainer: Debian GIS Project Uploaders: Youhei SASAKI -Build-Depends: debhelper (>= 9~), gem2deb, - ruby-narray, ruby-narray-miss, - libhe5-hdfeos-dev, libgctp-dev, libhdf5-serial-dev -Standards-Version: 3.9.7 +Section: ruby +Priority: optional +Build-Depends: debhelper (>= 9~), + gem2deb, + libgctp-dev, + libhdf5-serial-dev, + libhe5-hdfeos-dev, + ruby-narray, + ruby-narray-miss +Standards-Version: 3.9.8 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/ruby-hdfeos5.git -Vcs-Git: https://anonscm.debian.org/cgit/pkg-grass/ruby-hdfeos5.git +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/ruby-hdfeos5.git Homepage: http://ruby.gfd-dennou.org/products/ruby-hdfeos5/ XS-Ruby-Versions: all Package: ruby-hdfeos5 Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter +Depends: ruby | ruby-interpreter, + ${shlibs:Depends}, + ${misc:Depends} Description: Ruby interface to the HDF-EOS5 library HDF-EOS5 is a software library designed built on HDF5 to support EOS-specific data structures, namely Grid, Point, and Swath. diff -Nru ruby-hdfeos5-1.2/debian/lintian-overrides ruby-hdfeos5-1.2/debian/lintian-overrides --- ruby-hdfeos5-1.2/debian/lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/lintian-overrides 2016-12-02 15:00:12.000000000 +0000 @@ -0,0 +1,4 @@ +# Build uses -D_FORTIFY_SOURCE=2, but hardening-check reports: +# Fortify Source functions: no, only unprotected functions found! +ruby-hdfeos5: hardening-no-fortify-functions * + diff -Nru ruby-hdfeos5-1.2/debian/patches/0005-length-typo.patch ruby-hdfeos5-1.2/debian/patches/0005-length-typo.patch --- ruby-hdfeos5-1.2/debian/patches/0005-length-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/patches/0005-length-typo.patch 2016-12-02 15:00:00.000000000 +0000 @@ -0,0 +1,171 @@ +Description: Fix 'lengh' typo, replace with 'length'. +Author: Bas Couwenberg + +--- a/hdfeos5gd_wrap.c ++++ b/hdfeos5gd_wrap.c +@@ -2335,7 +2335,7 @@ hdfeos5_gdwritefield_char(VALUE mod, VAL + i_data = ALLOCA_N(unsigned char,c_edge_all); + for(i=0;i +Bug-Debian: https://bugs.debian.org/846353 + +--- a/hdfeos5gd_wrap.c ++++ b/hdfeos5gd_wrap.c +@@ -20,7 +20,7 @@ + #endif + + extern int check_numbertype(char *); +-extern int change_numbertype(char *); ++extern hid_t change_numbertype(char *); + extern int change_entrycode(char *); + extern int change_projcode(char *); + extern int change_compmethod(char *); +@@ -1327,7 +1327,7 @@ hdfeos5_gdinqfields(VALUE mod, VALUE ent + + i_count = (int)o_nflds; + rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count); +- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count); ++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count); + + return rb_ary_new3(4, nflds, fieldlist, rank, ntype); + } +@@ -1905,12 +1905,12 @@ hdfeos5_gdsetextdata(VALUE mod, VALUE fi + size = rb_Array(size); + } + i_filelist = RSTRING_PTR(filelist); +- i_offset = hdfeos5_obj2clongary(offset); ++ i_offset = hdfeos5_obj2cunsint64ary(offset); + i_size = hdfeos5_obj2cunsint64ary(size); + + o_rtn_val = HE5_GDsetextdata(i_gridid, i_filelist, i_offset, i_size); + rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue; +- hdfeos5_freeclongary(i_offset); ++ hdfeos5_freecunsint64ary(i_offset); + hdfeos5_freecunsint64ary(i_size); + return rtn_val; + } +@@ -1946,7 +1946,7 @@ hdfeos5_gdgetextdata(VALUE mod, VALUE fi + + namelength = hdfeos5_cintary2obj((int*)o_namelength,o_nfiles,1,&o_nfiles); + filelist = hdfeos5_ccharary2obj(o_filelist,o_nfiles,o_nfiles); +- offset = hdfeos5_clongary2obj(o_offset,o_nfiles,1,&o_nfiles); ++ offset = hdfeos5_cunsint64ary2obj(o_offset,o_nfiles,1,&o_nfiles); + size = hdfeos5_cunsint64ary2obj(o_size,o_nfiles,1,&o_nfiles); + + return rb_ary_new3(5,nfiles, namelength, filelist, offset, size); +--- a/hdfeos5sw_wrap.c ++++ b/hdfeos5sw_wrap.c +@@ -1098,7 +1098,7 @@ hdfeos5_swinqdatafields(VALUE mod, VALUE + + i_count = (int)o_nflds; + rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count); +- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count); ++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count); + + return rb_ary_new3(4, nflds, fieldlist, rank, ntype); + } +@@ -1139,7 +1139,7 @@ hdfeos5_swinqgeofields(VALUE mod, VALUE + + i_count = (int)o_nflds; + rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count); +- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count); ++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count); + + return rb_ary_new3(4, nflds, fieldlist, rank, ntype); + } +@@ -2685,12 +2685,12 @@ hdfeos5_swsetextdata(VALUE mod, VALUE fi + size = rb_Array(size); + } + i_filelist = RSTRING_PTR(filelist); +- i_offset = hdfeos5_obj2clongary(offset); ++ i_offset = hdfeos5_obj2cunsint64ary(offset); + i_size = hdfeos5_obj2cunsint64ary(size); + + o_rtn_val = HE5_SWsetextdata(i_swathid, i_filelist, i_offset, i_size); + rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue; +- hdfeos5_freeclongary(i_offset); ++ hdfeos5_freecunsint64ary(i_offset); + hdfeos5_freecunsint64ary(i_size); + return rtn_val; + } +@@ -2726,7 +2726,7 @@ hdfeos5_swgetextdata(VALUE mod, VALUE fi + + namelength = hdfeos5_cintary2obj((int*)o_namelength,o_rtn_val,1,&o_rtn_val); + filelist = hdfeos5_ccharary2obj(o_filelist,o_rtn_val,o_rtn_val); +- offset = hdfeos5_clongary2obj(o_offset,o_rtn_val,1,&o_rtn_val); ++ offset = hdfeos5_cunsint64ary2obj(o_offset,o_rtn_val,1,&o_rtn_val); + size = hdfeos5_cunsint64ary2obj(o_size,o_rtn_val,1,&o_rtn_val); + + return rb_ary_new3(5,rtn_val, namelength, filelist, offset, size); +--- a/hdfeos5za_wrap.c ++++ b/hdfeos5za_wrap.c +@@ -785,7 +785,7 @@ hdfeos5_zainquire(VALUE mod, VALUE entry + + i_count = (int)o_nflds; + rank = hdfeos5_cintary2obj(o_rank, i_count, 1, &i_count); +- ntype = hdfeos5_cintary2obj(o_ntype, i_count, 1, &i_count); ++ ntype = hdfeos5_cunsint64ary2obj(o_ntype, i_count, 1, &i_count); + + return rb_ary_new3(4, nflds, fieldlist, rank, ntype); + } +@@ -1603,12 +1603,12 @@ hdfeos5_zasetextdata(VALUE mod, VALUE fi + size = rb_Array(size); + } + i_filelist = RSTRING_PTR(filelist); +- i_offset = hdfeos5_obj2clongary(offset); ++ i_offset = hdfeos5_obj2cunsint64ary(offset); + i_size = hdfeos5_obj2cunsint64ary(size); + + o_rtn_val = HE5_ZAsetextdata(i_zaid, i_filelist, i_offset, i_size); + rtn_val = (o_rtn_val == FAIL) ? Qfalse : Qtrue; +- hdfeos5_freeclongary(i_offset); ++ hdfeos5_freecunsint64ary(i_offset); + hdfeos5_freecunsint64ary(i_size); + return rtn_val; + } +@@ -1644,7 +1644,7 @@ hdfeos5_zagetextdata(VALUE mod, VALUE fi + + namelength = hdfeos5_cintary2obj((int*)o_namelength,o_rtn_val,1,&o_rtn_val); + filelist = hdfeos5_ccharary2obj(o_filelist,o_rtn_val,o_rtn_val); +- offset = hdfeos5_clongary2obj(o_offset,o_rtn_val,1,&o_rtn_val); ++ offset = hdfeos5_cunsint64ary2obj(o_offset,o_rtn_val,1,&o_rtn_val); + size = hdfeos5_cunsint64ary2obj(o_size,o_rtn_val,1,&o_rtn_val); + + return rb_ary_new3(5,rtn_val, namelength, filelist, offset, size); +--- a/hdfeos5_chkdatatype.c ++++ b/hdfeos5_chkdatatype.c +@@ -156,7 +156,7 @@ check_numbertype(char *numbertype) + __FILE__,__LINE__); + } + +-int ++hid_t + change_numbertype(char *numbertype) + { + if(strcmp(numbertype,"byte")==0) return(H5T_NATIVE_CHAR); diff -Nru ruby-hdfeos5-1.2/debian/patches/series ruby-hdfeos5-1.2/debian/patches/series --- ruby-hdfeos5-1.2/debian/patches/series 2015-09-04 05:56:38.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/patches/series 2016-12-03 18:26:57.000000000 +0000 @@ -2,3 +2,5 @@ 0002-Fix-test-data-path.patch 0003-Fix-printf-debugging.patch 0004-hdf5-dir.patch +0005-length-typo.patch +0006-hid_t.patch diff -Nru ruby-hdfeos5-1.2/debian/rules ruby-hdfeos5-1.2/debian/rules --- ruby-hdfeos5-1.2/debian/rules 2016-03-01 09:11:26.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/rules 2016-12-02 15:00:00.000000000 +0000 @@ -15,7 +15,7 @@ %: @echo $(HDF5_DIR) - dh $@ --with ruby --buildsystem ruby + dh $@ --with ruby --buildsystem ruby --parallel override_dh_auto_clean: dh_auto_clean diff -Nru ruby-hdfeos5-1.2/debian/watch ruby-hdfeos5-1.2/debian/watch --- ruby-hdfeos5-1.2/debian/watch 2015-02-22 01:04:26.000000000 +0000 +++ ruby-hdfeos5-1.2/debian/watch 2016-12-02 14:40:55.000000000 +0000 @@ -1,2 +1,6 @@ version=3 -http://ruby.gfd-dennou.org/products/ruby-hdfeos5/release/ ruby-hdfeos5-(1\..*)\.tar\.gz +opts=\ +dversionmangle=s/\+(debian|dfsg|ds|deb)\d*$//,\ +uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre(?:view)?|dev|beta|alpha)\d*)$/$1~$2/;s/RC/rc/ \ +http://ruby.gfd-dennou.org/products/ruby-hdfeos5/release/ \ +(?:.*?/)?ruby-hdfeos5[\-\_]?(\d\S+)\.(?:tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))