[SCM] hdf5 branch, master, updated. upstream/1.8.12-114-g02acab6

[Gilles Filippini]

The following commit has been merged in the master branch:
commit 484bc602fe66189c50aa7df2963a3fd4f0754b10
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Dec 8 14:25:02 2013 +0100

    Apply ubuntu patch from 1.8.11-5ubuntu1

diff --git a/debian/changelog b/debian/changelog
index d21e3a1..24d5ed8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,10 @@ hdf5 (1.8.12-1) UNRELEASED; urgency=low
     + skip_cxx_inclusion.diff
     + soname.diff
     + ullong_force.diff
+  * Apply ubuntu patch from 1.8.11-5ubuntu1 (Colin Watson):
+    - Disable openmpi on arm64.
+    - Use the autotools-dev dh addon to update config.guess/config.sub for
+      arm64.
   * soname:
     - Rework patch soname.diff to act on LT_VERS_AGE instead of
       LT_VERS_INTERFACE
diff --git a/debian/control b/debian/control
index 0c6a980..793489a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,9 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
- libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
- gfortran, libibverbs-dev [!arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath
+ libopenmpi-dev [!arm64 !hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
+ gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
+ sharutils, mpi-default-dev, chrpath, autotools-dev
 Standards-Version: 3.9.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
diff --git a/debian/control.in b/debian/control.in
index 9f7c7f9..595745f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,9 +5,9 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
- libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
- gfortran, libibverbs-dev [!arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath
+ libopenmpi-dev [!arm64 !hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
+ gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
+ sharutils, mpi-default-dev, chrpath, autotools-dev
 Standards-Version: 3.9.4
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git
diff --git a/debian/rules b/debian/rules
index 0aac302..516eb33 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,6 +36,8 @@ ARCHS=alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc kfreebsd-
 
 ifeq ($(DEB_HOST_ARCH),arm)
 build_openmpi = no
+else ifeq ($(DEB_HOST_ARCH),arm64)
+build_openmpi = no
 else ifeq ($(DEB_HOST_ARCH),hppa)
 build_openmpi = no
 else ifeq ($(DEB_HOST_ARCH),m68k)
@@ -114,6 +116,7 @@ configure-stamp-debian: debian/control.in
 		ln -sf $$i $(mpich2pack).$$j ; \
 		done
 	sed -e "s/@SONAME@/$(soname)/g" debian/shlibs.in > debian/$(serpack).shlibs
+	dh_autotools-dev_updateconfig
 	touch $@
 
 configure-stamp: configure-stamp-debian
@@ -183,6 +186,7 @@ clean:
 	-rm -rf debian/build-mpich2
 	-find debian -type l | xargs rm -f
 	grep -v ^\% debian/control.in | sed -e "s/@SONAME@/$(soname)/g" -e "s/@ARCHS@/$(ARCHS)/" -e "s/@MAJOR_VERSION@/$(major_version)/" > debian/control
+	dh_autotools-dev_restoreconfig
 	dh_clean configure-stamp* build-stamp* install-stamp* debian/*.shlibs
 
 install: build prep install-serial $(install_openmpi) install-mpich2 install-doc

-- 
Hierarchical Data Format 5 (HDF5)