From d2a4c60c13a9a3ede1a8caa7f6e751e4753636ee Mon Sep 17 00:00:00 2001
From: Dimitrios Eftaxiopoulos <eftaxi12@otenet.gr>
Date: Thu, 30 Dec 2010 18:27:48 +0200
Subject: [PATCH] Try a patch for FTBFS on i386

---
 debian/changelog                         | 4 ++--
 debian/patches/mgl-mgl_data_io_cpp.patch | 6 +++---
 mgl/mgl_data_io.cpp                      | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cf54496..4729c4f 100644
--- 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 10c17e9..62f15d9 100644
--- 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
 +{
 +#ifdef HAVE_HDF4
-+	long sd = SDstart(fname,DFACC_READ), nn, i;
++	int32 sd = SDstart(fname,DFACC_READ), nn, i;
 +	if(sd==-1)	return;	// is not a HDF4 file
 +	char name[64];
 +	SDfileinfo(sd,&nn,&i);
 +	for(i=0;i<nn;i++)
 +	{
-+		long sds, rank, dims[32], type, attr, in[2]={0,0};
++		int32 sds, rank, dims[32], type, attr, in[2]={0,0};
 +		sds = SDselect(sd,i);
 +		SDgetinfo(sds,name,&rank,dims,&type,&attr);
 +		if(!strcmp(name,data))	// as I understand there are possible many datas with the same name
diff --git a/mgl/mgl_data_io.cpp b/mgl/mgl_data_io.cpp
index e389422..efcd0a4 100644
--- 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)
 {
 #ifdef HAVE_HDF4
-	long sd = SDstart(fname,DFACC_READ), nn, i;
+	int32 sd = SDstart(fname,DFACC_READ), nn, i;
 	if(sd==-1)	return;	// is not a HDF4 file
 	char name[64];
 	SDfileinfo(sd,&nn,&i);
 	for(i=0;i<nn;i++)
 	{
-		long sds, rank, dims[32], type, attr, in[2]={0,0};
+		int32 sds, rank, dims[32], type, attr, in[2]={0,0};
 		sds = SDselect(sd,i);
 		SDgetinfo(sds,name,&rank,dims,&type,&attr);
 		if(!strcmp(name,data))	// as I understand there are possible many datas with the same name
-- 
2.30.2