Try a patch for FTBFS on i386

diff --git a/debian/changelog b/debian/changelog
index cf544968afbe91e0d8fdcc004ca228cb6a21f36d..4729c4f19bc41e20f1e062d79e93905636e4271f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
 mathgl (1.11.0.1-2) experimental; urgency=low
 
-  * Apply upstream patch for FTBFS on i386 (Closes: #607539).
+  * Apply patch for FTBFS on i386 (Closes: #607539).
   * Change debian/rules file.
 
- -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Sun, 12 Dec 2010 19:13:00 +0200
+ -- Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>  Thu, 30 Dec 2010 14:36:00 +0200
 
 mathgl (1.11.0.1-1) experimental; urgency=low
 

diff --git a/debian/patches/mgl-mgl_data_io_cpp.patch b/debian/patches/mgl-mgl_data_io_cpp.patch
index 10c17e95a50bb313cf5f6d511798bea2f347544a..62f15d999993ed566a88784793df6acd8172d614 100644 (file)
--- a/debian/patches/mgl-mgl_data_io_cpp.patch
+++ b/debian/patches/mgl-mgl_data_io_cpp.patch
@@ -1,4 +1,4 @@
-Upstream patch for FTBFS on i386
+Fixes FTBFS on i386
 --- a/mgl/mgl_data_io.cpp
 +++ b/mgl/mgl_data_io.cpp
 @@ -2,33 +2,33 @@
@@ -234,13 +234,13 @@ Upstream patch for FTBFS on i386
 -#endif
 +{\r
 +#ifdef HAVE_HDF4\r
-+      long sd = SDstart(fname,DFACC_READ), nn, i;\r
++      int32 sd = SDstart(fname,DFACC_READ), nn, i;\r
 +      if(sd==-1)      return; // is not a HDF4 file\r
 +      char name[64];\r
 +      SDfileinfo(sd,&nn,&i);\r
 +      for(i=0;i<nn;i++)\r
 +      {\r
-+              long sds, rank, dims[32], type, attr, in[2]={0,0};\r
++              int32 sds, rank, dims[32], type, attr, in[2]={0,0};\r
 +              sds = SDselect(sd,i);\r
 +              SDgetinfo(sds,name,&rank,dims,&type,&attr);\r
 +              if(!strcmp(name,data))  // as I understand there are possible many datas with the same name\r

diff --git a/mgl/mgl_data_io.cpp b/mgl/mgl_data_io.cpp
index e389422aaf11e2b89a3bd88068eb37cff492f937..efcd0a47afb3d7241a49d0b446b21a3379f01014 100644 (file)
--- a/mgl/mgl_data_io.cpp
+++ b/mgl/mgl_data_io.cpp
@@ -914,13 +914,13 @@ void mglData::Fill(const char *eq, mglPoint r1, mglPoint r2, const mglData *v, c
 void mglData::ReadHDF4(const char *fname,const char *data)\r
 {\r
 #ifdef HAVE_HDF4\r
-       long sd = SDstart(fname,DFACC_READ), nn, i;\r
+       int32 sd = SDstart(fname,DFACC_READ), nn, i;\r
        if(sd==-1)      return; // is not a HDF4 file\r
        char name[64];\r
        SDfileinfo(sd,&nn,&i);\r
        for(i=0;i<nn;i++)\r
        {\r
-               long sds, rank, dims[32], type, attr, in[2]={0,0};\r
+               int32 sds, rank, dims[32], type, attr, in[2]={0,0};\r
                sds = SDselect(sd,i);\r
                SDgetinfo(sds,name,&rank,dims,&type,&attr);\r
                if(!strcmp(name,data))  // as I understand there are possible many datas with the same name\r