diff -Nru libhdf4-4.2.10/debian/changelog libhdf4-4.2.10/debian/changelog
--- libhdf4-4.2.10/debian/changelog	2015-03-02 02:03:56.000000000 +0800
+++ libhdf4-4.2.10/debian/changelog	2015-03-22 23:12:00.000000000 +0800
@@ -1,3 +1,12 @@
+libhdf4 (4.2.10-3.2) unstable; urgency=medium
+
+  [James Cowgill]
+  * mips64.diff: fix testcase run on mips64(el). (Closes: #779624)
+
+  * Fix unpatch flow.
+
+ -- YunQiang Su <syq@debian.org>  Sun, 22 Mar 2015 23:03:13 +0800
+
 libhdf4 (4.2.10-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru libhdf4-4.2.10/debian/patches/mips64.diff libhdf4-4.2.10/debian/patches/mips64.diff
--- libhdf4-4.2.10/debian/patches/mips64.diff	1970-01-01 08:00:00.000000000 +0800
+++ libhdf4-4.2.10/debian/patches/mips64.diff	2015-03-22 22:49:45.000000000 +0800
@@ -0,0 +1,15 @@
+--- a/HDF4/mfhdf/libsrc/xdrposix.c
++++ b/HDF4/mfhdf/libsrc/xdrposix.c
+@@ -283,12 +283,6 @@ static void xdrposix_destroy();
+ static struct xdr_ops   xdrposix_ops = {
+     xdrposix_getlong,   /* deserialize a 32-bit int */
+     xdrposix_putlong,   /* serialize a 32-bit int */
+-#if (_MIPS_SZLONG == 64)
+-    /* IRIX64 has 64 bits long and 32 bits int. */
+-    /* It defines two extra entries for get/put int. */
+-    xdrposix_getint,   /* deserialize a 32-bit int */
+-    xdrposix_putint,   /* serialize a 32-bit int */
+-#endif
+     xdrposix_getbytes,  /* deserialize counted bytes */
+     xdrposix_putbytes,  /* serialize counted bytes */
+     xdrposix_getpos,    /* get offset in the stream */
diff -Nru libhdf4-4.2.10/debian/patches/series libhdf4-4.2.10/debian/patches/series
--- libhdf4-4.2.10/debian/patches/series	2014-10-21 21:20:19.000000000 +0800
+++ libhdf4-4.2.10/debian/patches/series	2015-03-22 23:01:10.000000000 +0800
@@ -11,4 +11,4 @@
 missing-includes.diff
 fix_string_literals.diff
 ppc64el.patch
-
+mips64.diff
diff -Nru libhdf4-4.2.10/debian/rules libhdf4-4.2.10/debian/rules
--- libhdf4-4.2.10/debian/rules	2015-03-02 01:19:26.000000000 +0800
+++ libhdf4-4.2.10/debian/rules	2015-03-22 22:58:43.000000000 +0800
@@ -49,7 +49,7 @@
 
 stamps/patch-stamp: stamps/unpack-stamp
 	dh_testdir
-	rm -f HDF4 && mv -f HDF$(RELEASE) HDF4
+	rm -rf HDF4 && mv -f HDF$(RELEASE) HDF4
 	# create alternative patches on fly
 	cp -a debian/patches debian/patches1
 	cp -a debian/patches debian/patches2
@@ -60,7 +60,7 @@
 	mv -f .pc .pc1
 	mv -f HDF4 HDF$(RELEASE)
 
-	rm -f HDF4 && mv -f HDF4_ALT HDF4 
+	rm -rf HDF4 && mv -f HDF4_ALT HDF4 
 	QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches2 quilt push -a --color=auto || [ $$? = 2 ]
 	mv -f .pc .pc2
 	mv -f HDF4 HDF4_ALT
@@ -68,18 +68,21 @@
 
 unpatch:
 	dh_testdir
-	rm -f HDF4 && ln -sf HDF$(RELEASE) HDF4
+	rm -rf HDF4 && mv -f HDF$(RELEASE) HDF4
 	mv -f .pc1 .pc 
 	QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches1 quilt pop -a || true
 	mv -f .pc .pc1
-	rm -rf HDF4 && ln -sf HDF4_ALT HDF4 && mv .pc2 .pc
+	mv HDF4 HDF$(RELEASE)
+
+	rm -rf HDF4 && mv -f HDF4_ALT HDF4 && mv .pc2 .pc
 	QUILT_PATCH_OPTS="-p1" QUILT_PATCHES=debian/patches2 quilt pop -a || true
 	mv -f .pc .pc2
+	mv -f HDF4 HDF4_ALT
 	rm -rf $(CURDIR)/stamps/patch-stamp HDF4 .pc .pc1 .pc2 $(CURDIR)/debian/patches1 $(CURDIR)/debian/patches2
 
 configure: stamps/configure-stamp
 stamps/configure-stamp: patch
-	rm -f HDF4 && ln -sf HDF$(RELEASE) HDF4
+	rm -rf HDF4 && ln -sf HDF$(RELEASE) HDF4
 	# build the 'regular' netcdf-clashing flavor.
 	cd HDF4 \
 		&& libtoolize \