[hdf4] 01/01: 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 master
in repository hdf4.

commit ae8bc0ced4f1b9d8b5d71e599ade96ec588e3170
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).
---
 debian/changelog      |  9 +++++++++
 debian/patches/series |  2 +-
 debian/rules          | 13 ++++++++-----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3e4d99b..415486b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,15 @@ libhdf4 (4.2.10-4) UNRELEASED; urgency=medium
 
  -- Johan Van de Wauw <johan.vandewauw at gmail.com>  Tue, 03 Mar 2015 11:16:45 +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/series b/debian/patches/series
index 9fe6256..3e1d6da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@ install-examples.diff
 missing-includes.diff
 fix_string_literals.diff
 ppc64el.patch
-
+mips64.diff
diff --git a/debian/rules b/debian/rules
index 4dfca10..858b160 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,7 +49,7 @@ stamps/unpack-stamp: debian/control
 
 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 @@ stamps/patch-stamp: stamps/unpack-stamp
 	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 @@ stamps/patch-stamp: stamps/unpack-stamp
 
 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 \

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