Control: tags 846853 + pending Dear maintainer,
I've prepared an NMU for hdf-eos5 (versioned as 5.1.15.dfsg.1-8.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should delay it longer. Regards, _g. diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/changelog hdf-eos5-5.1.15.dfsg.1/debian/changelog --- hdf-eos5-5.1.15.dfsg.1/debian/changelog 2016-06-20 23:05:34.000000000 +0200 +++ hdf-eos5-5.1.15.dfsg.1/debian/changelog 2016-12-03 01:48:32.000000000 +0100 @@ -1,3 +1,10 @@ +hdf-eos5 (5.1.15.dfsg.1-8.1) unstable; urgency=medium + + * Non-maintainer upload + * New patch hid_t.patch: hid_t isn't native int anymore (closes: #846853) + + -- Gilles Filippini <[email protected]> Sat, 03 Dec 2016 01:48:32 +0100 + hdf-eos5 (5.1.15.dfsg.1-8) unstable; urgency=medium * Patch to build against hdf5-1.10.1: use hid_t not int (hid_t == int64_t diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/patches/hid_t.patch hdf-eos5-5.1.15.dfsg.1/debian/patches/hid_t.patch --- hdf-eos5-5.1.15.dfsg.1/debian/patches/hid_t.patch 1970-01-01 01:00:00.000000000 +0100 +++ hdf-eos5-5.1.15.dfsg.1/debian/patches/hid_t.patch 2016-12-03 01:48:32.000000000 +0100 @@ -0,0 +1,682 @@ +Index: hdf-eos5-5.1.15.dfsg.1/src/EHapi.c +=================================================================== +--- hdf-eos5-5.1.15.dfsg.1.orig/src/EHapi.c ++++ hdf-eos5-5.1.15.dfsg.1/src/EHapi.c +@@ -314,6 +314,8 @@ HE5_EHhid2long(hid_t invalue) + outvalue = HE5_EHint2long(invalue); + else if (sizeof(hid_t) == sizeof(long)) + outvalue = invalue; ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHllong2long(invalue); + + return(outvalue); + } +@@ -399,6 +401,8 @@ HE5_EHhid2int(hid_t invalue) + outvalue = invalue; + else if (sizeof(hid_t) == sizeof(long)) + outvalue = HE5_EHlong2int(invalue); ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHllong2int(invalue); + + return(outvalue); + } +@@ -436,6 +440,8 @@ HE5_EHint2hid(int invalue) + outvalue = invalue; + else if (sizeof(hid_t) == sizeof(long)) + outvalue = HE5_EHint2long(invalue); ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHint2llong(invalue); + + return(outvalue); + } +@@ -474,6 +480,8 @@ HE5_EHlong2hid(long invalue) + outvalue = HE5_EHlong2int(invalue); + else if (sizeof(hid_t) == sizeof(long)) + outvalue = invalue; ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHlong2llong(invalue); + + return(outvalue); + } +@@ -565,6 +573,8 @@ HE5_EHhid2hsize(hid_t invalue) + outvalue = HE5_EHint2hsize(invalue); + else if (sizeof(hid_t) == sizeof(long) ) + outvalue = HE5_EHlong2hsize(invalue); ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHllong2hsize(invalue); + + return(outvalue); + } +@@ -717,6 +727,8 @@ HE5_EHhsize2hid(hsize_t invalue) + outvalue = HE5_EHhsize2int(invalue); + else if (sizeof(hid_t) == sizeof(long) ) + outvalue = HE5_EHhsize2long(invalue); ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHhsize2llong(invalue); + + return(outvalue); + } +@@ -866,6 +878,8 @@ HE5_EHhid2hssize(hid_t invalue) + outvalue = HE5_EHint2hssize(invalue); + else if (sizeof(hid_t) == sizeof(long) ) + outvalue = HE5_EHlong2hssize(invalue); ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHllong2hssize(invalue); + + return(outvalue); + } +@@ -1016,6 +1030,8 @@ HE5_EHhssize2hid(hssize_t invalue) + outvalue = HE5_EHhssize2int(invalue); + else if (sizeof(hid_t) == sizeof(long) ) + outvalue = HE5_EHhssize2long(invalue); ++ else if (sizeof(hid_t) == sizeof(long long)) ++ outvalue = HE5_EHhssize2llong(invalue); + + return(outvalue); + } +@@ -1348,6 +1364,178 @@ HE5_EHhsize2hssize(hsize_t invalue) + return(outvalue); + } + ++long long ++HE5_EHint2llong(int invalue) ++{ ++ herr_t status = FAIL; ++ long long outvalue = FAIL; ++ long long buf = FAIL; ++ ++ ++ memmove(&buf,&invalue,sizeof(int)); ++ ++ status = H5Tconvert(H5T_NATIVE_INT, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHint2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"int\" to \"long long\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,&buf,sizeof(long long)); ++ ++ return(outvalue); ++} ++long long ++HE5_EHlong2llong(long invalue) ++{ ++ herr_t status = FAIL; ++ long long outvalue = FAIL; ++ long long buf = FAIL; ++ ++ ++ memmove(&buf,&invalue,sizeof(long)); ++ ++ status = H5Tconvert(H5T_NATIVE_LONG, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHlong2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long\" to \"long long\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,&buf,sizeof(long long)); ++ ++ return(outvalue); ++} ++long long ++HE5_EHhsize2llong(hsize_t invalue) ++{ ++ herr_t status = FAIL; ++ long long outvalue = FAIL; ++ long long buf = FAIL; ++ ++ ++ memmove(&buf,&invalue,H5Tget_size(H5T_NATIVE_HSIZE)); ++ ++ status = H5Tconvert(H5T_NATIVE_HSIZE, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHhsize2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"hsize_t\" to \"long long\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,&buf,sizeof(long long)); ++ ++ return(outvalue); ++} ++long long ++HE5_EHhssize2llong(hssize_t invalue) ++{ ++ herr_t status = FAIL; ++ long long outvalue = FAIL; ++ long long buf = FAIL; ++ ++ ++ memmove(&buf,&invalue,H5Tget_size(H5T_NATIVE_HSSIZE)); ++ ++ status = H5Tconvert(H5T_NATIVE_HSSIZE, H5T_NATIVE_LLONG, 1, &buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHhssize2llong", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"hssize_t\" to \"long long\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,&buf,sizeof(long long)); ++ ++ return(outvalue); ++} ++int ++HE5_EHllong2int(long long invalue) ++{ ++ herr_t status = FAIL; ++ int outvalue = FAIL; ++ long long *buf = (long long *)NULL; ++ ++ buf = (long long *)calloc(1,sizeof(long long)); ++ memmove(buf,&invalue,sizeof(long long)); ++ ++ status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_INT, 1, buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHllong2int", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"int\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,buf,sizeof(int)); ++ free(buf); ++ ++ return(outvalue); ++} ++long ++HE5_EHllong2long(long long invalue) ++{ ++ herr_t status = FAIL; ++ long outvalue = FAIL; ++ long long *buf = (long long *)NULL; ++ ++ buf = (long long *)calloc(1,sizeof(long long)); ++ memmove(buf,&invalue,sizeof(long long)); ++ ++ status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_LONG, 1, buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHllong2long", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"long\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,buf,sizeof(long)); ++ free(buf); ++ ++ return(outvalue); ++} ++hsize_t ++HE5_EHllong2hsize(long long invalue) ++{ ++ herr_t status = FAIL; ++ hsize_t outvalue = FAIL; ++ long long *buf = (long long *)NULL; ++ ++ buf = (long long *)calloc(1,sizeof(long long)); ++ memmove(buf,&invalue,sizeof(long long)); ++ ++ status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_HSIZE, 1, buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHllong2hsize", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"hsize_t\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,buf,H5Tget_size(H5T_NATIVE_HSIZE)); ++ free(buf); ++ ++ return(outvalue); ++} ++hssize_t ++HE5_EHllong2hssize(long long invalue) ++{ ++ herr_t status = FAIL; ++ hssize_t outvalue = FAIL; ++ long long *buf = (long long *)NULL; ++ ++ buf = (long long *)calloc(1,sizeof(long long)); ++ memmove(buf,&invalue,sizeof(long long)); ++ ++ status = H5Tconvert(H5T_NATIVE_LLONG, H5T_NATIVE_HSSIZE, 1, buf, NULL, H5P_DEFAULT); ++ if (status == FAIL) ++ { ++ H5Epush(__FILE__, "HE5_EHllong2hssize", __LINE__, H5E_FUNC, H5E_CANTINIT, "Cannot convert \"long long\" to \"hssize_t\" data type."); ++ return(status); ++ } ++ ++ memmove(&outvalue,buf,H5Tget_size(H5T_NATIVE_HSSIZE)); ++ free(buf); ++ ++ return(outvalue); ++} + + /*----------------------------------------------------------------------------| + | BEGIN_PROLOG | +Index: hdf-eos5-5.1.15.dfsg.1/include/HE5_HdfEosDef.h +=================================================================== +--- hdf-eos5-5.1.15.dfsg.1.orig/include/HE5_HdfEosDef.h ++++ hdf-eos5-5.1.15.dfsg.1/include/HE5_HdfEosDef.h +@@ -560,6 +560,15 @@ long HE5_EHhssize2long(h + int HE5_EHhssize2int(hssize_t invalue); + hsize_t HE5_EHhssize2hsize(hssize_t invalue); + ++long long HE5_EHint2llong(int invalue); ++long long HE5_EHlong2llong(long invalue); ++long long HE5_EHhsize2llong(hsize_t invalue); ++long long HE5_EHhssize2llong(hssize_t invalue); ++int HE5_EHllong2int(long long invalue); ++long HE5_EHllong2long(long long invalue); ++hsize_t HE5_EHllong2hsize(long long invalue); ++hssize_t HE5_EHllong2hssize(long long invalue); ++ + unsigned LONGLONG HE5_EHint2ullong(int invalue); + long HE5_EHullong2long(unsigned LONGLONG invalue); + +Index: hdf-eos5-5.1.15.dfsg.1/src/PTapi.c +=================================================================== +--- hdf-eos5-5.1.15.dfsg.1.orig/src/PTapi.c ++++ hdf-eos5-5.1.15.dfsg.1/src/PTapi.c +@@ -104,82 +104,82 @@ HE5_PTgetlevelname_fromSM(hid_t pointID, + int + HE5_PTopenF(char *filename, uintn Flags); + int +-HE5_PTcreateF(int FileID, char *pointname); ++HE5_PTcreateF(hid_t FileID, char *pointname); + int +-HE5_PTattachF(int FileID, char *pointname); ++HE5_PTattachF(hid_t FileID, char *pointname); + int +-HE5_PTdetachF(int pointID); ++HE5_PTdetachF(hid_t pointID); + int +-HE5_PTcloseF(int FileID); ++HE5_PTcloseF(hid_t FileID); + + /* Definition routines */ + + int +-HE5_PTdeflevelF(int pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[]); ++HE5_PTdeflevelF(hid_t pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[]); + int +-HE5_PTdeflinkageF(int pointID, char *parent, char *child, char *linkfield); ++HE5_PTdeflinkageF(hid_t pointID, char *parent, char *child, char *linkfield); + + /* I/O routines */ + + int +-HE5_PTreadlevelF(int pointID, int level, char *fieldname, int ntype, void *datbuf); ++HE5_PTreadlevelF(hid_t pointID, int level, char *fieldname, int ntype, void *datbuf); + int +-HE5_PTupdatelevelF(int pointID, int level, char *fieldlist, long nrec, long recs[], int ntype, void *data); ++HE5_PTupdatelevelF(hid_t pointID, int level, char *fieldlist, long nrec, long recs[], int ntype, void *data); + int +-HE5_PTwritelevelF(int pointID, int level, long count[], char *fieldname, int ntype, void *data); ++HE5_PTwritelevelF(hid_t pointID, int level, long count[], char *fieldname, int ntype, void *data); + int +-HE5_PTwriteattrF(int pointID, const char *attrname, int ntype, long fortcount[], void *datbuf); ++HE5_PTwriteattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void *datbuf); + int +-HE5_PTwritegrpattrF(int pointID, const char *attrname, int ntype, long fortcount[], void * datbuf); ++HE5_PTwritegrpattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void * datbuf); + int +-HE5_PTwritelocattrF(int pointID, const char *levelname, const char *attrname, int ntype, long count[],void * datbuf); ++HE5_PTwritelocattrF(hid_t pointID, const char *levelname, const char *attrname, int ntype, long count[],void * datbuf); + int +-HE5_PTreadattrF(int pointID, const char *attrname, void *datbuf); ++HE5_PTreadattrF(hid_t pointID, const char *attrname, void *datbuf); + int +-HE5_PTreadgrpattrF(int pointID, const char *attrname, void *datbuf); ++HE5_PTreadgrpattrF(hid_t pointID, const char *attrname, void *datbuf); + int +-HE5_PTreadlocattrF(int pointID, const char *levelname, const char *attrname, void *datbuf); ++HE5_PTreadlocattrF(hid_t pointID, const char *levelname, const char *attrname, void *datbuf); + int +-HE5_PTwrbckptrF(int pointID, int level); ++HE5_PTwrbckptrF(hid_t pointID, int level); + int +-HE5_PTwrfwdptrF(int pointID, int level); ++HE5_PTwrfwdptrF(hid_t pointID, int level); + + /* Inquiry routines */ + + int +-HE5_PTnrecsF(int pointID, int level); ++HE5_PTnrecsF(hid_t pointID, int level); + int + HE5_PTnlevelsF(hid_t pointID); + int +-HE5_PTnfieldsF(int pointID, int level, char *fieldlist, long *strbufsize); ++HE5_PTnfieldsF(hid_t pointID, int level, char *fieldlist, long *strbufsize); + int +-HE5_PTlevelindxF(int pointID, const char *levelname); ++HE5_PTlevelindxF(hid_t pointID, const char *levelname); + int +-HE5_PTgetlevelnameF(int pointID, int level, char *levelname, long *strbufsize); ++HE5_PTgetlevelnameF(hid_t pointID, int level, char *levelname, long *strbufsize); + int +-HE5_PTbcklinkinfoF(int pointID, int level, char *linkfield); ++HE5_PTbcklinkinfoF(hid_t pointID, int level, char *linkfield); + int +-HE5_PTfwdlinkinfoF(int pointID, int level, char *linkfield); ++HE5_PTfwdlinkinfoF(hid_t pointID, int level, char *linkfield); + int +-HE5_PTlevelinfoF(int pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[]); ++HE5_PTlevelinfoF(hid_t pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[]); + int +-HE5_PTinqdatatypeF(int pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size); ++HE5_PTinqdatatypeF(hid_t pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size); + int + HE5_PTinqpointF(const char *filename, char *pointlist, long *strbufsize); + int +-HE5_PTattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount); ++HE5_PTattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount); + int +-HE5_PTgrpattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount); ++HE5_PTgrpattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount); + int +-HE5_PTlocattrinfoF(int pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount); ++HE5_PTlocattrinfoF(hid_t pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount); + long +-HE5_PTinqattrsF(int pointID, char *attrnames, long *strbufsize); ++HE5_PTinqattrsF(hid_t pointID, char *attrnames, long *strbufsize); + long +-HE5_PTinqgrpattrsF(int pointID, char *attrnames, long *strbufsize); ++HE5_PTinqgrpattrsF(hid_t pointID, char *attrnames, long *strbufsize); + long +-HE5_PTinqlocattrsF(int pointID, const char *levelname, char *attrnames, long *strbufsize); ++HE5_PTinqlocattrsF(hid_t pointID, const char *levelname, char *attrnames, long *strbufsize); + int +-HE5_PTnumtypeinfoF(int pointID, int level, int numtype[]); ++HE5_PTnumtypeinfoF(hid_t pointID, int level, int numtype[]); + + + /* Fortran Wrapper Utility Routines */ +@@ -8119,7 +8119,7 @@ HE5_PTopenF(char *filename, uintn Flags) + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTcreateF(int FileID, char *pointname) ++HE5_PTcreateF(hid_t FileID, char *pointname) + { + int PointID = FAIL;/* point ID (return value) */ + +@@ -8187,7 +8187,7 @@ HE5_PTcreateF(int FileID, char *pointnam + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTattachF(int FileID, char *pointname) ++HE5_PTattachF(hid_t FileID, char *pointname) + { + int PointID = FAIL; /* Return value of the Point ID */ + +@@ -8259,7 +8259,7 @@ HE5_PTattachF(int FileID, char *pointnam + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTdetachF(int PointID) ++HE5_PTdetachF(hid_t PointID) + { + int ret = FAIL;/* (int) Return status variable */ + +@@ -8329,7 +8329,7 @@ HE5_PTdetachF(int PointID) + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTcloseF(int FileID) ++HE5_PTcloseF(hid_t FileID) + { + int ret = FAIL;/* (int) return status variable */ + +@@ -8412,7 +8412,7 @@ HE5_PTcloseF(int FileID) + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTdeflevelF(int pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[]) ++HE5_PTdeflevelF(hid_t pointID, const char *levelname, int rank[], char *fieldlist, long *dim_sizes, int dtype[], int array[]) + { + herr_t status = FAIL;/* routine return status variable */ + +@@ -8609,7 +8609,7 @@ HE5_PTdeflevelF(int pointID, const char + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTdeflinkageF(int pointID, char *parent, char *child, char *linkfield) ++HE5_PTdeflinkageF(hid_t pointID, char *parent, char *child, char *linkfield) + { + int ret = FAIL;/* (int) Return status variable */ + +@@ -8686,7 +8686,7 @@ HE5_PTdeflinkageF(int pointID, char *par + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTreadlevelF(int pointID, int level, char *fieldname, int ntype, void *datbuf) ++HE5_PTreadlevelF(hid_t pointID, int level, char *fieldname, int ntype, void *datbuf) + { + int ret = FAIL;/* (int) return status variable */ + +@@ -9075,7 +9075,7 @@ HE5_PTreadlevel_f(hid_t pointID, int lev + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTwritelevelF(int pointID, int level, long count[], char *fieldname, int ntype, void *data) ++HE5_PTwritelevelF(hid_t pointID, int level, long count[], char *fieldname, int ntype, void *data) + { + herr_t status = FAIL;/* routine return status variable */ + +@@ -9546,7 +9546,7 @@ HE5_PTwritelevel_f(hid_t pointID, int le + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTwrbckptrF(int pointID, int level) ++HE5_PTwrbckptrF(hid_t pointID, int level) + { + int ret = FAIL;/* (int) Return status variable */ + +@@ -9615,7 +9615,7 @@ HE5_PTwrbckptrF(int pointID, int level) + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTwrfwdptrF(int pointID, int level) ++HE5_PTwrfwdptrF(hid_t pointID, int level) + { + int ret = FAIL;/* (int) Return status variable */ + +@@ -9688,7 +9688,7 @@ HE5_PTwrfwdptrF(int pointID, int level) + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTupdatelevelF(int pointID, int level, char *fieldlist, long nrec, long recs[], int ntype, void *data) ++HE5_PTupdatelevelF(hid_t pointID, int level, char *fieldlist, long nrec, long recs[], int ntype, void *data) + { + herr_t status = FAIL; + +@@ -10426,7 +10426,7 @@ HE5_PTupdatelevel_f(hid_t pointID, int l + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTwriteattrF(int pointID, const char *attrname, int ntype, long fortcount[], void *datbuf) ++HE5_PTwriteattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void *datbuf) + { + + int ret = FAIL;/* int return status variable */ +@@ -10584,7 +10584,7 @@ HE5_PTwriteattrF(int pointID, const char + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTwritegrpattrF(int pointID, const char *attrname, int ntype, long fortcount[], void * datbuf) ++HE5_PTwritegrpattrF(hid_t pointID, const char *attrname, int ntype, long fortcount[], void * datbuf) + { + int ret = FAIL; /* (int) return status variable */ + int rank = 1; /* Rank variable */ +@@ -10739,7 +10739,7 @@ HE5_PTwritegrpattrF(int pointID, const c + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTwritelocattrF(int pointID, const char *levelname, const char *attrname, int ntype, long fortcount[],void * datbuf) ++HE5_PTwritelocattrF(hid_t pointID, const char *levelname, const char *attrname, int ntype, long fortcount[],void * datbuf) + { + int ret = FAIL; /* routine return status variable */ + int rank = 1; /* Note: It is assumed that fortcout has just */ +@@ -10893,7 +10893,7 @@ HE5_PTwritelocattrF(int pointID, const c + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTreadattrF(int pointID, const char *attrname, void *datbuf) ++HE5_PTreadattrF(hid_t pointID, const char *attrname, void *datbuf) + { + int ret = FAIL;/* routine return status variable */ + +@@ -10949,7 +10949,7 @@ HE5_PTreadattrF(int pointID, const char + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTreadgrpattrF(int pointID, const char *attrname, void *datbuf) ++HE5_PTreadgrpattrF(hid_t pointID, const char *attrname, void *datbuf) + { + int ret = FAIL; /* (int) return status */ + +@@ -11004,7 +11004,7 @@ HE5_PTreadgrpattrF(int pointID, const ch + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTreadlocattrF(int pointID, const char *levelname, const char *attrname, void *datbuf) ++HE5_PTreadlocattrF(hid_t pointID, const char *levelname, const char *attrname, void *datbuf) + { + int ret = FAIL;/* return status variable */ + +@@ -11714,7 +11714,7 @@ HE5_PTgetfort_order(long *dims, int dim_ + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTnrecsF(int pointID, int level) ++HE5_PTnrecsF(hid_t pointID, int level) + { + hid_t PointID = FAIL;/* HDF5 type point ID */ + +@@ -11839,7 +11839,7 @@ HE5_PTnlevelsF(hid_t pointID) + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTnfieldsF(int pointID, int level, char *fieldlist, long *strbufsize) ++HE5_PTnfieldsF(hid_t pointID, int level, char *fieldlist, long *strbufsize) + { + hid_t PointID = FAIL;/* HDF5 type point ID */ + +@@ -11904,7 +11904,7 @@ HE5_PTnfieldsF(int pointID, int level, c + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTlevelindxF(int pointID, const char *levelname) ++HE5_PTlevelindxF(hid_t pointID, const char *levelname) + { + hid_t PointID = FAIL;/* HDF5 type point ID */ + +@@ -11970,7 +11970,7 @@ HE5_PTlevelindxF(int pointID, const char + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTgetlevelnameF(int pointID, int level, char *levelname, long *strbufsize) ++HE5_PTgetlevelnameF(hid_t pointID, int level, char *levelname, long *strbufsize) + { + int ret = FAIL; + +@@ -12040,7 +12040,7 @@ HE5_PTgetlevelnameF(int pointID, int le + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTbcklinkinfoF(int pointID, int level, char *linkfield) ++HE5_PTbcklinkinfoF(hid_t pointID, int level, char *linkfield) + { + int ret = FAIL; + +@@ -12108,7 +12108,7 @@ HE5_PTbcklinkinfoF(int pointID, int leve + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTfwdlinkinfoF(int pointID, int level, char *linkfield) ++HE5_PTfwdlinkinfoF(hid_t pointID, int level, char *linkfield) + { + int ret = FAIL; + +@@ -12185,7 +12185,7 @@ HE5_PTfwdlinkinfoF(int pointID, int leve + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTlevelinfoF(int pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[]) ++HE5_PTlevelinfoF(hid_t pointID, int level, char *levelname, int rank[], char *fieldlist, long *dim_sizes, long *datasize, long offset[], int dtype[]) + { + herr_t status = FAIL;/* routine return status variable */ + +@@ -12311,7 +12311,7 @@ HE5_PTlevelinfoF(int pointID, int level, + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTinqdatatypeF(int pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size) ++HE5_PTinqdatatypeF(hid_t pointID, char *fieldname, char *attrname, int fieldgroup, int *Type, int *Class, int *Order, long *size) + { + int ret = FAIL; /* (int) status variable */ + +@@ -12500,7 +12500,7 @@ HE5_PTinqpointF(const char *filename, ch + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount) ++HE5_PTattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount) + { + int ret = FAIL; /* (int) return status variable */ + +@@ -12601,7 +12601,7 @@ HE5_PTattrinfoF(int pointID, const char + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTgrpattrinfoF(int pointID, const char *attrname, int *numbertype, long *fortcount) ++HE5_PTgrpattrinfoF(hid_t pointID, const char *attrname, int *numbertype, long *fortcount) + { + int ret = FAIL; /* (int) return status variable */ + +@@ -12701,7 +12701,7 @@ HE5_PTgrpattrinfoF(int pointID, const ch + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTlocattrinfoF(int pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount) ++HE5_PTlocattrinfoF(hid_t pointID, const char *levelname, const char *attrname, int *numbertype, long *fortcount) + { + int ret = FAIL; /* (int) return status variable */ + +@@ -12802,7 +12802,7 @@ HE5_PTlocattrinfoF(int pointID, const ch + | END_PROLOG | + -----------------------------------------------------------------------------*/ + long +-HE5_PTinqattrsF(int pointID, char *attrnames, long *strbufsize) ++HE5_PTinqattrsF(hid_t pointID, char *attrnames, long *strbufsize) + { + long nattr = FAIL;/* Number of attributes (return) */ + +@@ -12876,7 +12876,7 @@ HE5_PTinqattrsF(int pointID, char *attrn + | END_PROLOG | + -----------------------------------------------------------------------------*/ + long +-HE5_PTinqgrpattrsF(int pointID, char *attrnames, long *strbufsize) ++HE5_PTinqgrpattrsF(hid_t pointID, char *attrnames, long *strbufsize) + { + long nattr = FAIL; /* Number of attributes (return) */ + +@@ -12947,7 +12947,7 @@ HE5_PTinqgrpattrsF(int pointID, char *at + | END_PROLOG | + -----------------------------------------------------------------------------*/ + long +-HE5_PTinqlocattrsF(int pointID, const char *levelname, char *attrnames, long *strbufsize) ++HE5_PTinqlocattrsF(hid_t pointID, const char *levelname, char *attrnames, long *strbufsize) + { + long nattr = FAIL; /* Number of attributes */ + +@@ -13013,7 +13013,7 @@ HE5_PTinqlocattrsF(int pointID, const ch + | END_PROLOG | + -----------------------------------------------------------------------------*/ + int +-HE5_PTnumtypeinfoF(int pointID, int level, int numtype[]) ++HE5_PTnumtypeinfoF(hid_t pointID, int level, int numtype[]) + { + herr_t status = FAIL;/* routine return status variable */ + diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/patches/series hdf-eos5-5.1.15.dfsg.1/debian/patches/series --- hdf-eos5-5.1.15.dfsg.1/debian/patches/series 2016-06-20 14:57:30.000000000 +0200 +++ hdf-eos5-5.1.15.dfsg.1/debian/patches/series 2016-12-03 01:48:32.000000000 +0100 @@ -8,3 +8,4 @@ hdf_hl.patch hit_t-changes.patch x +hid_t.patch
