[hdf4] 01/08: Merge changes from libhdf4 (4.2.10-3.2).

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository hdf4.

commit 77ec21a3aa8c90dedf9fb3cefee9f7bef83bd71c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat May 7 16:58:19 2016 +0200

    Merge changes from libhdf4 (4.2.10-3.2).
    
    Conflicts:
    	debian/patches/series
    	debian/rules
---
 debian/changelog                               | 9 +++++++++
 debian/patches/{mips64el.patch => mips64.diff} | 2 +-
 debian/patches/series                          | 2 +-
 debian/rules                                   | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1ac2986..aa69657 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,15 @@ libhdf4 (4.2.11-1~exp) UNRELEASED; urgency=medium
 
  -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Sat, 14 Feb 2015 13:43:51 +0100
 
+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 at debian.org>  Sun, 22 Mar 2015 23:03:13 +0800
+
 libhdf4 (4.2.10-3.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/patches/mips64el.patch b/debian/patches/mips64.diff
similarity index 92%
rename from debian/patches/mips64el.patch
rename to debian/patches/mips64.diff
index 433d187..d0ac3b8 100644
--- a/debian/patches/mips64el.patch
+++ b/debian/patches/mips64.diff
@@ -1,6 +1,6 @@
 --- a/mfhdf/libsrc/xdrposix.c
 +++ b/mfhdf/libsrc/xdrposix.c
-@@ -283,12 +283,6 @@ static void xdrposix_destroy();
+@@ -287,12 +287,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 */
diff --git a/debian/patches/series b/debian/patches/series
index 98e6af7..8e98731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,4 @@ install-examples.diff
 missing-includes.diff
 ppc64el.patch
 enablesharedfortran.diff
-mips64el.patch
+mips64.diff
diff --git a/debian/rules b/debian/rules
index 304fd8c..83ab04b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ unpatch:
 
 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 \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf4.git