[SCM] hdf5 branch, upstream, updated. upstream/1.8.4-patch1-79-gbfcb1ff

Francesco Paolo Lovergine frankie at debian.org
Wed Nov 16 10:34:14 UTC 2011


The following commit has been merged in the upstream branch:
commit df603fab9aa218d9af87ed325c0d443020c857e8
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Mar 11 15:25:33 2010 +0000

    Updates for 1.8.4-patch1

diff --git a/debian/changelog b/debian/changelog
index a691e2f..04949e1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-hdf5 (1.8.4-6) unstable; urgency=low
+hdf5 (1.8.4-patch1-1) unstable; urgency=low
 
+  * New upstream patch release.
+    This version fixes a corruption problem on big-endian archs, as detailed in 
+    http://www.hdfgroup.org/newsletters/bulletin20100226.html.
+    This issue appears only when using netcdf4 format.
   * Fixed typo in 1.8.4-4 changelog.
   * Added a useful test target in debian/rules to run the auto test suite.
+  * Now debian/rules skips a suffix like -[^-]* in parsing upstream version.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 02 Feb 2010 15:27:09 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 11 Mar 2010 15:17:29 +0100
 
 hdf5 (1.8.4-5) unstable; urgency=low
 
diff --git a/debian/patches/autotools.diff b/debian/patches/autotools.diff
index 881712f..dc06a82 100644
--- a/debian/patches/autotools.diff
+++ b/debian/patches/autotools.diff
@@ -1,6 +1,6 @@
-diff -urN hdf5-1.8.4.orig/aclocal.m4 hdf5-1.8.4/aclocal.m4
---- hdf5-1.8.4.orig/aclocal.m4	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/aclocal.m4	2010-01-21 11:45:42.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/aclocal.m4 hdf5-1.8.4-patch1/aclocal.m4
+--- hdf5-1.8.4-patch1.orig/aclocal.m4	2010-02-22 22:32:50.000000000 +0100
++++ hdf5-1.8.4-patch1/aclocal.m4	2010-03-11 15:57:46.000000000 +0100
 @@ -1,4 +1,4 @@
 -# generated automatically by aclocal 1.11 -*- Autoconf -*-
 +# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
@@ -12726,34 +12726,57 @@ diff -urN hdf5-1.8.4.orig/aclocal.m4 hdf5-1.8.4/aclocal.m4
 +AC_SUBST([am__untar])
 +]) # _AM_PROG_TAR
  
-diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
---- hdf5-1.8.4.orig/bin/config.guess	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/bin/config.guess	2010-01-21 11:45:54.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/bin/config.guess hdf5-1.8.4-patch1/bin/config.guess
+--- hdf5-1.8.4-patch1.orig/bin/config.guess	2010-02-22 22:32:03.000000000 +0100
++++ hdf5-1.8.4-patch1/bin/config.guess	2010-03-11 15:57:58.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Attempt to guess a canonical system name.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-12-13'
-+timestamp='2009-06-10'
++timestamp='2009-12-30'
  
  # This file is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License as published by
-@@ -55,8 +56,8 @@
+@@ -26,16 +27,16 @@
+ # the same distribution terms that you use for the rest of that program.
+ 
+ 
+-# Originally written by Per Bothner <per at bothner.com>.
+-# Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# Originally written by Per Bothner.  Please send patches (context
++# diff format) to <config-patches at gnu.org> and include a ChangeLog
++# entry.
+ #
+ # This script attempts to guess a canonical system name similar to
+ # config.sub.  If it succeeds, it prints the system name on stdout, and
+ # exits with 0.  Otherwise, it exits with 1.
+ #
+-# The plan is that this can be called by configure scripts if you
+-# don't specify an explicit build system type.
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+ 
+ me=`echo "$0" | sed -e 's,.*/,,'`
+ 
+@@ -55,8 +56,9 @@
  GNU config.guess ($timestamp)
  
  Originally written by Per Bothner.
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 -Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -106,7 +107,7 @@
+@@ -106,7 +108,7 @@
  trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
  trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
  : ${TMPDIR=/tmp} ;
@@ -12762,7 +12785,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
   { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
   { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
   { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-@@ -160,6 +161,7 @@
+@@ -160,6 +162,7 @@
  	    arm*) machine=arm-unknown ;;
  	    sh3el) machine=shl-unknown ;;
  	    sh3eb) machine=sh-unknown ;;
@@ -12770,7 +12793,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
  	esac
  	# The Operating System including object format, if it has switched
-@@ -168,7 +170,7 @@
+@@ -168,7 +171,7 @@
  	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
  		eval $set_cc_for_build
  		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -12779,7 +12802,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  		then
  		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
  		    # Return netbsd for either.  FIX?
-@@ -206,8 +208,11 @@
+@@ -206,8 +209,11 @@
      *:ekkoBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
  	exit ;;
@@ -12792,7 +12815,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	exit ;;
      *:MirBSD:*:*)
  	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-@@ -319,14 +324,30 @@
+@@ -319,14 +325,33 @@
  	case `/usr/bin/uname -p` in
  	    sparc) echo sparc-icl-nx7; exit ;;
  	esac ;;
@@ -12807,6 +12830,9 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	exit ;;
 -    i86pc:SunOS:5.*:*)
 -	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
++    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
++	echo i386-pc-auroraux${UNAME_RELEASE}
++	exit ;;
 +    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
 +	eval $set_cc_for_build
 +	SUN_ARCH="i386"
@@ -12825,7 +12851,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	exit ;;
      sun4*:SunOS:6*:*)
  	# According to config.sub, this is the proper way to canonicalize
-@@ -527,7 +548,7 @@
+@@ -527,7 +552,7 @@
  		echo rs6000-ibm-aix3.2
  	fi
  	exit ;;
@@ -12834,7 +12860,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
  	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
  		IBM_ARCH=rs6000
-@@ -635,7 +656,7 @@
+@@ -635,7 +660,7 @@
  	    # => hppa64-hp-hpux11.23
  
  	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
@@ -12843,7 +12869,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	    then
  		HP_ARCH="hppa2.0w"
  	    else
-@@ -764,12 +785,19 @@
+@@ -764,12 +789,19 @@
  	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
  	exit ;;
      *:FreeBSD:*:*)
@@ -12865,19 +12891,19 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	echo ${UNAME_MACHINE}-pc-mingw32
  	exit ;;
      i*:windows32*:*)
-@@ -779,12 +807,24 @@
+@@ -779,12 +811,24 @@
      i*:PW*:*)
  	echo ${UNAME_MACHINE}-pc-pw32
  	exit ;;
 -    x86:Interix*:[345]*)
 -	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
 -	exit ;;
-+    *:Interix*:[3456]*)
++    *:Interix*:*)
 +    	case ${UNAME_MACHINE} in
 +	    x86)
 +		echo i586-pc-interix${UNAME_RELEASE}
 +		exit ;;
-+	    EM64T | authenticamd | genuineintel)
++	    authenticamd | genuineintel | EM64T)
 +		echo x86_64-unknown-interix${UNAME_RELEASE}
 +		exit ;;
 +	    IA64)
@@ -12893,9 +12919,24 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
      i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
  	# How do we know it's Interix rather than the generic POSIX subsystem?
  	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-@@ -815,6 +855,16 @@
+@@ -814,7 +858,31 @@
+     i*86:Minix:*:*)
  	echo ${UNAME_MACHINE}-pc-minix
  	exit ;;
++    alpha:Linux:*:*)
++	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
++	  EV5)   UNAME_MACHINE=alphaev5 ;;
++	  EV56)  UNAME_MACHINE=alphaev56 ;;
++	  PCA56) UNAME_MACHINE=alphapca56 ;;
++	  PCA57) UNAME_MACHINE=alphapca56 ;;
++	  EV6)   UNAME_MACHINE=alphaev6 ;;
++	  EV67)  UNAME_MACHINE=alphaev67 ;;
++	  EV68*) UNAME_MACHINE=alphaev68 ;;
++        esac
++	objdump --private-headers /bin/sh | grep -q ld.so.1
++	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
++	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++	exit ;;
      arm*:Linux:*:*)
 +	eval $set_cc_for_build
 +	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
@@ -12910,7 +12951,25 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
      cris:Linux:*:*)
-@@ -835,42 +885,27 @@
+@@ -826,6 +894,17 @@
+     frv:Linux:*:*)
+     	echo frv-unknown-linux-gnu
+ 	exit ;;
++    i*86:Linux:*:*)
++	LIBC=gnu
++	eval $set_cc_for_build
++	sed 's/^	//' << EOF >$dummy.c
++	#ifdef __dietlibc__
++	LIBC=dietlibc
++	#endif
++EOF
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
++	echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
++	exit ;;
+     ia64:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-unknown-linux-gnu
+ 	exit ;;
+@@ -835,66 +914,33 @@
      m68*:Linux:*:*)
  	echo ${UNAME_MACHINE}-unknown-linux-gnu
  	exit ;;
@@ -12955,43 +13014,71 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	#endif
  EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^CPU/{s: ::g;p;}'`"
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^CPU/{
-+		s: ::g
-+		p
-+	    }'`"
++	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
  	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
  	;;
      or32:Linux:*:*)
-@@ -892,10 +927,13 @@
- 	  EV67)  UNAME_MACHINE=alphaev67 ;;
- 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-         esac
--	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-+	objdump --private-headers /bin/sh | grep -q ld.so.1
- 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
- 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ 	echo or32-unknown-linux-gnu
  	exit ;;
+-    ppc:Linux:*:*)
+-	echo powerpc-unknown-linux-gnu
 +    padre:Linux:*:*)
 +	echo sparc-unknown-linux-gnu
-+	exit ;;
+ 	exit ;;
+-    ppc64:Linux:*:*)
+-	echo powerpc64-unknown-linux-gnu
+-	exit ;;
+-    alpha:Linux:*:*)
+-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+-	  EV5)   UNAME_MACHINE=alphaev5 ;;
+-	  EV56)  UNAME_MACHINE=alphaev56 ;;
+-	  PCA56) UNAME_MACHINE=alphapca56 ;;
+-	  PCA57) UNAME_MACHINE=alphapca56 ;;
+-	  EV6)   UNAME_MACHINE=alphaev6 ;;
+-	  EV67)  UNAME_MACHINE=alphaev67 ;;
+-	  EV68*) UNAME_MACHINE=alphaev68 ;;
+-        esac
+-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
++    parisc64:Linux:*:* | hppa64:Linux:*:*)
++	echo hppa64-unknown-linux-gnu
+ 	exit ;;
      parisc:Linux:*:* | hppa:Linux:*:*)
  	# Look for CPU level
- 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-@@ -925,6 +963,9 @@
+@@ -904,8 +950,11 @@
+ 	  *)    echo hppa-unknown-linux-gnu ;;
+ 	esac
+ 	exit ;;
+-    parisc64:Linux:*:* | hppa64:Linux:*:*)
+-	echo hppa64-unknown-linux-gnu
++    ppc64:Linux:*:*)
++	echo powerpc64-unknown-linux-gnu
++	exit ;;
++    ppc:Linux:*:*)
++	echo powerpc-unknown-linux-gnu
+ 	exit ;;
+     s390:Linux:*:* | s390x:Linux:*:*)
+ 	echo ${UNAME_MACHINE}-ibm-linux
+@@ -925,65 +974,9 @@
      x86_64:Linux:*:*)
  	echo x86_64-unknown-linux-gnu
  	exit ;;
-+    xtensa*:Linux:*:*)
-+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-+	exit ;;
-     i*86:Linux:*:*)
- 	# The BFD linker knows what the default object file format is, so
- 	# first see if it will tell us. cd to the root directory to prevent
-@@ -940,17 +981,6 @@
- 	  elf32-i386)
- 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
- 		;;
+-    i*86:Linux:*:*)
+-	# The BFD linker knows what the default object file format is, so
+-	# first see if it will tell us. cd to the root directory to prevent
+-	# problems with other programs or directories called `ld' in the path.
+-	# Set LC_ALL=C to ensure ld outputs messages in English.
+-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+-			 | sed -ne '/supported targets:/!d
+-				    s/[ 	][ 	]*/ /g
+-				    s/.*supported targets: *//
+-				    s/ .*//
+-				    p'`
+-        case "$ld_supported_targets" in
+-	  elf32-i386)
+-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+-		;;
 -	  a.out-i386-linux)
 -		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 -		exit ;;
@@ -13003,32 +13090,46 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
 -		# one that does not give us useful --help.
 -		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 -		exit ;;
- 	esac
- 	# Determine whether the default compiler is a.out or elf
- 	eval $set_cc_for_build
-@@ -967,7 +997,7 @@
- 	LIBC=gnulibc1
- 	# endif
- 	#else
+-	esac
+-	# Determine whether the default compiler is a.out or elf
+-	eval $set_cc_for_build
+-	sed 's/^	//' << EOF >$dummy.c
+-	#include <features.h>
+-	#ifdef __ELF__
+-	# ifdef __GLIBC__
+-	#  if __GLIBC__ >= 2
+-	LIBC=gnu
+-	#  else
+-	LIBC=gnulibc1
+-	#  endif
+-	# else
+-	LIBC=gnulibc1
+-	# endif
+-	#else
 -	#if defined(__INTEL_COMPILER) || defined(__PGI)
-+	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
- 	LIBC=gnu
- 	#else
- 	LIBC=gnuaout
-@@ -977,7 +1007,11 @@
- 	LIBC=dietlibc
- 	#endif
- EOF
+-	LIBC=gnu
+-	#else
+-	LIBC=gnuaout
+-	#endif
+-	#endif
+-	#ifdef __dietlibc__
+-	LIBC=dietlibc
+-	#endif
+-EOF
 -	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '/^LIBC/{s: ::g;p;}'`"
-+	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-+	    /^LIBC/{
-+		s: ::g
-+		p
-+	    }'`"
- 	test x"${LIBC}" != x && {
- 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
- 		exit
-@@ -1012,7 +1046,7 @@
+-	test x"${LIBC}" != x && {
+-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+-		exit
+-	}
+-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
+-	;;
++    xtensa*:Linux:*:*)
++    	echo ${UNAME_MACHINE}-unknown-linux-gnu
++	exit ;;
+     i*86:DYNIX/ptx:4*:*)
+ 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ 	# earlier versions are messed up and put the nodename in both
+@@ -1012,7 +1005,7 @@
      i*86:syllable:*:*)
  	echo ${UNAME_MACHINE}-pc-syllable
  	exit ;;
@@ -13037,7 +13138,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	echo i386-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      i*86:*DOS:*:*)
-@@ -1056,8 +1090,11 @@
+@@ -1056,8 +1049,11 @@
      pc:*:*:*)
  	# Left here for compatibility:
          # uname -m prints for DJGPP always 'pc', but it prints nothing about
@@ -13051,7 +13152,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
          exit ;;
      Intel:Mach:3*:*)
  	echo i386-pc-mach3
-@@ -1095,6 +1132,16 @@
+@@ -1095,6 +1091,16 @@
      3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
          /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
            && { echo i486-ncr-sysv4; exit; } ;;
@@ -13068,7 +13169,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
      m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
  	echo m68k-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
-@@ -1107,7 +1154,7 @@
+@@ -1107,7 +1113,7 @@
      rs6000:LynxOS:2.*:*)
  	echo rs6000-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
@@ -13077,7 +13178,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  	echo powerpc-unknown-lynxos${UNAME_RELEASE}
  	exit ;;
      SM[BE]S:UNIX_SV:*:*)
-@@ -1170,6 +1217,9 @@
+@@ -1170,6 +1176,9 @@
      BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
  	echo i586-pc-beos
  	exit ;;
@@ -13087,7 +13188,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
      SX-4:SUPER-UX:*:*)
  	echo sx4-nec-superux${UNAME_RELEASE}
  	exit ;;
-@@ -1179,6 +1229,15 @@
+@@ -1179,6 +1188,15 @@
      SX-6:SUPER-UX:*:*)
  	echo sx6-nec-superux${UNAME_RELEASE}
  	exit ;;
@@ -13103,7 +13204,24 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
      Power*:Rhapsody:*:*)
  	echo powerpc-apple-rhapsody${UNAME_RELEASE}
  	exit ;;
-@@ -1269,6 +1328,9 @@
+@@ -1188,6 +1206,16 @@
+     *:Darwin:*:*)
+ 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ 	case $UNAME_PROCESSOR in
++	    i386)
++		eval $set_cc_for_build
++		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
++		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
++		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
++		      grep IS_64BIT_ARCH >/dev/null
++		  then
++		      UNAME_PROCESSOR="x86_64"
++		  fi
++		fi ;;
+ 	    unknown) UNAME_PROCESSOR=powerpc ;;
+ 	esac
+ 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+@@ -1269,6 +1297,9 @@
      i*86:rdos:*:*)
  	echo ${UNAME_MACHINE}-pc-rdos
  	exit ;;
@@ -13113,7 +13231,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  esac
  
  #echo '(No uname command or uname output not recognized.)' 1>&2
-@@ -1429,9 +1491,9 @@
+@@ -1429,9 +1460,9 @@
  the operating system you are using. It is advised that you
  download the most up to date version of the config scripts from
  
@@ -13125,34 +13243,53 @@ diff -urN hdf5-1.8.4.orig/bin/config.guess hdf5-1.8.4/bin/config.guess
  
  If the version you run ($0) is already up to date, please
  send the following data and any information you think might be
-diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
---- hdf5-1.8.4.orig/bin/config.sub	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/bin/config.sub	2010-01-21 11:45:54.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/bin/config.sub hdf5-1.8.4-patch1/bin/config.sub
+--- hdf5-1.8.4-patch1.orig/bin/config.sub	2010-02-22 22:32:03.000000000 +0100
++++ hdf5-1.8.4-patch1/bin/config.sub	2010-03-11 15:57:58.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # Configuration validation subroutine script.
  #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 -#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
++#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
 +#   Free Software Foundation, Inc.
  
 -timestamp='2005-12-11'
-+timestamp='2009-06-11'
++timestamp='2010-01-22'
  
  # This file is (in principle) common to ALL GNU software.
  # The presence of a machine in this file suggests that SOME GNU software
-@@ -71,8 +72,8 @@
+@@ -31,13 +32,16 @@
+ 
+ 
+ # Please send patches to <config-patches at gnu.org>.  Submit a context
+-# diff and a properly formatted ChangeLog entry.
++# diff and a properly formatted GNU ChangeLog entry.
+ #
+ # Configuration subroutine to validate and canonicalize a configuration type.
+ # Supply the specified configuration type as an argument.
+ # If it is invalid, we print an error message on stderr and exit with code 1.
+ # Otherwise, we print the canonical config type on stdout and succeed.
+ 
++# You can get the latest version of this script from:
++# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
++
+ # This file is supposed to be the same for all GNU packages
+ # and recognize all the CPU types, system types and aliases
+ # that are meaningful with *any* GNU software.
+@@ -71,8 +75,9 @@
  version="\
  GNU config.sub ($timestamp)
  
 -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
 -Free Software Foundation, Inc.
-+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
++2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
++Software Foundation, Inc.
  
  This is free software; see the source for copying conditions.  There is NO
  warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-@@ -121,6 +122,7 @@
+@@ -121,6 +126,7 @@
  case $maybe_os in
    nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
    uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
@@ -13160,7 +13297,12 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
    storm-chaos* | os2-emx* | rtmk-nova*)
      os=-$maybe_os
      basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-@@ -151,6 +153,9 @@
+@@ -147,10 +153,13 @@
+ 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+-	-apple | -axis | -knuth | -cray)
++	-apple | -axis | -knuth | -cray | -microblaze)
  		os=
  		basic_machine=$1
  		;;
@@ -13170,7 +13312,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	-sim | -cisco | -oki | -wec | -winbond)
  		os=
  		basic_machine=$1
-@@ -240,20 +245,24 @@
+@@ -240,20 +249,24 @@
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  	| am33_2.0 \
@@ -13199,7 +13341,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	| mips64vr4100 | mips64vr4100el \
  	| mips64vr4300 | mips64vr4300el \
  	| mips64vr5000 | mips64vr5000el \
-@@ -266,26 +275,26 @@
+@@ -266,29 +279,31 @@
  	| mipsisa64sr71k | mipsisa64sr71kel \
  	| mipstx39 | mipstx39el \
  	| mn10200 | mn10300 \
@@ -13213,6 +13355,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
  	| pyramid \
 -	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
++	| rx \
 +	| score \
 +	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
  	| sh64 | sh64le \
@@ -13223,19 +13366,24 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
 +	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 +	| spu | strongarm \
  	| tahoe | thumb | tic4x | tic80 | tron \
++	| ubicom32 \
  	| v850 | v850e \
  	| we32k \
 -	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
 -	| z8k)
--		basic_machine=$basic_machine-unknown
--		;;
--	m32c)
 +	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
 +	| z8k | z80)
  		basic_machine=$basic_machine-unknown
  		;;
- 	m6811 | m68hc11 | m6812 | m68hc12)
-@@ -317,25 +326,28 @@
+-	m32c)
+-		basic_machine=$basic_machine-unknown
+-		;;
+-	m6811 | m68hc11 | m6812 | m68hc12)
++	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+ 		# Motorola 68HC11/12.
+ 		basic_machine=$basic_machine-unknown
+ 		os=-none
+@@ -317,25 +332,28 @@
  	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
  	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
  	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
@@ -13257,7 +13405,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
 +	| m32c-* | m32r-* | m32rle-* \
  	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
 -	| m88110-* | m88k-* | maxq-* | mcore-* \
-+	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
++	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
  	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
  	| mips16-* \
  	| mips64-* | mips64el-* \
@@ -13269,7 +13417,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	| mips64vr4100-* | mips64vr4100el-* \
  	| mips64vr4300-* | mips64vr4300el-* \
  	| mips64vr5000-* | mips64vr5000el-* \
-@@ -350,28 +362,31 @@
+@@ -350,28 +368,33 @@
  	| mmix-* \
  	| mt-* \
  	| msp430-* \
@@ -13279,8 +13427,9 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
  	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
  	| pyramid-* \
- 	| romp-* | rs6000-* \
+-	| romp-* | rs6000-* \
 -	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
++	| romp-* | rs6000-* | rx-* \
 +	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
  	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 -	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
@@ -13289,9 +13438,10 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
 -	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
 +	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
  	| tahoe-* | thumb-* \
--	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+ 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
++	| tile-* | tilegx-* \
  	| tron-* \
++	| ubicom32-* \
  	| v850-* | v850e-* | vax-* \
  	| we32k-* \
 -	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
@@ -13309,7 +13459,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  		;;
  	# Recognize the various machine names and aliases which stand
  	# for a CPU type and a company and sometimes even an OS.
-@@ -435,6 +450,10 @@
+@@ -435,6 +458,10 @@
  		basic_machine=m68k-apollo
  		os=-bsd
  		;;
@@ -13320,7 +13470,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	aux)
  		basic_machine=m68k-apple
  		os=-aux
-@@ -443,10 +462,26 @@
+@@ -443,10 +470,26 @@
  		basic_machine=ns32k-sequent
  		os=-dynix
  		;;
@@ -13347,7 +13497,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	convex-c1)
  		basic_machine=c1-convex
  		os=-bsd
-@@ -475,8 +510,8 @@
+@@ -475,8 +518,8 @@
  		basic_machine=craynv-cray
  		os=-unicosmp
  		;;
@@ -13358,7 +13508,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  		os=-elf
  		;;
  	crds | unos)
-@@ -514,6 +549,10 @@
+@@ -514,6 +557,10 @@
  		basic_machine=m88k-motorola
  		os=-sysv3
  		;;
@@ -13369,7 +13519,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	djgpp)
  		basic_machine=i586-pc
  		os=-msdosdjgpp
-@@ -668,6 +707,14 @@
+@@ -668,6 +715,14 @@
  		basic_machine=m68k-isi
  		os=-sysv
  		;;
@@ -13384,7 +13534,14 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	m88k-omron*)
  		basic_machine=m88k-omron
  		;;
-@@ -683,6 +730,10 @@
+@@ -679,10 +734,17 @@
+ 		basic_machine=ns32k-utek
+ 		os=-sysv
+ 		;;
++        microblaze)
++		basic_machine=microblaze-xilinx
++		;;
+ 	mingw32)
  		basic_machine=i386-pc
  		os=-mingw32
  		;;
@@ -13395,7 +13552,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	miniframe)
  		basic_machine=m68000-convergent
  		;;
-@@ -809,6 +860,14 @@
+@@ -809,6 +871,14 @@
  		basic_machine=i860-intel
  		os=-osf
  		;;
@@ -13410,7 +13567,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	pbd)
  		basic_machine=sparc-tti
  		;;
-@@ -818,6 +877,12 @@
+@@ -818,6 +888,12 @@
  	pc532 | pc532-*)
  		basic_machine=ns32k-pc532
  		;;
@@ -13423,7 +13580,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	pentium | p5 | k5 | k6 | nexgen | viac3)
  		basic_machine=i586-pc
  		;;
-@@ -904,6 +969,10 @@
+@@ -904,6 +980,10 @@
  	sb1el)
  		basic_machine=mipsisa64sb1el-unknown
  		;;
@@ -13434,7 +13591,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	sei)
  		basic_machine=mips-sei
  		os=-seiux
-@@ -915,6 +984,9 @@
+@@ -915,6 +995,9 @@
  		basic_machine=sh-hitachi
  		os=-hms
  		;;
@@ -13444,10 +13601,15 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	sh64)
  		basic_machine=sh64-unknown
  		;;
-@@ -1004,6 +1076,10 @@
+@@ -1004,6 +1087,15 @@
  		basic_machine=tic6x-unknown
  		os=-coff
  		;;
++        # This must be matched before tile*.
++        tilegx*)
++		basic_machine=tilegx-unknown
++		os=-linux-gnu
++		;;
 +	tile*)
 +		basic_machine=tile-unknown
 +		os=-linux-gnu
@@ -13455,7 +13617,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	tx39)
  		basic_machine=mipstx39-unknown
  		;;
-@@ -1079,6 +1155,10 @@
+@@ -1079,6 +1171,10 @@
  		basic_machine=z8k-unknown
  		os=-sim
  		;;
@@ -13466,7 +13628,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	none)
  		basic_machine=none-none
  		os=-none
-@@ -1117,10 +1197,10 @@
+@@ -1117,10 +1213,10 @@
  	we32k)
  		basic_machine=we32k-att
  		;;
@@ -13479,14 +13641,25 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  		basic_machine=sparc-sun
  		;;
  	cydra)
-@@ -1187,18 +1267,20 @@
+@@ -1167,6 +1263,9 @@
+         # First match some system type aliases
+         # that might get confused with valid system types.
+ 	# -solaris* is a basic system type, with this one exception.
++        -auroraux)
++	        os=-auroraux
++		;;
+ 	-solaris1 | -solaris1.*)
+ 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ 		;;
+@@ -1187,18 +1286,20 @@
  	# Each alternative MUST END IN A *, to match a version number.
  	# -sysv* is not here because it comes later, after sysvr4.
  	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
 -	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 +	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-+	      | -kopensolaris* \
++	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
++	      | -sym* | -kopensolaris* \
  	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
 -	      | -aos* \
 +	      | -aos* | -aros* \
@@ -13504,26 +13677,28 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
  	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
  	      | -uxpv* | -beos* | -mpeix* | -udk* \
-@@ -1208,7 +1290,7 @@
+@@ -1208,7 +1309,7 @@
  	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
  	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
  	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
 -	      | -skyos* | -haiku* | -rdos*)
-+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
++	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
  	# Remember, each alternative MUST END IN *, to match a version number.
  		;;
  	-qnx*)
-@@ -1338,6 +1420,9 @@
+@@ -1338,6 +1439,11 @@
  	-zvmoe)
  		os=-zvmoe
  		;;
 +	-dicos*)
 +		os=-dicos
 +		;;
++        -nacl*)
++	        ;;
  	-none)
  		;;
  	*)
-@@ -1360,6 +1445,12 @@
+@@ -1360,6 +1466,12 @@
  # system, and we'll never get to this point.
  
  case $basic_machine in
@@ -13536,7 +13711,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	*-acorn)
  		os=-riscix1.2
  		;;
-@@ -1369,9 +1460,9 @@
+@@ -1369,9 +1481,9 @@
  	arm*-semi)
  		os=-aout
  		;;
@@ -13549,7 +13724,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	# This must come before the *-dec entry.
  	pdp10-*)
  		os=-tops20
-@@ -1397,6 +1488,9 @@
+@@ -1397,6 +1509,9 @@
  	m68*-cisco)
  		os=-aout
  		;;
@@ -13559,7 +13734,7 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  	mips*-cisco)
  		os=-elf
  		;;
-@@ -1526,7 +1620,7 @@
+@@ -1526,7 +1641,7 @@
  			-sunos*)
  				vendor=sun
  				;;
@@ -13568,9 +13743,9 @@ diff -urN hdf5-1.8.4.orig/bin/config.sub hdf5-1.8.4/bin/config.sub
  				vendor=ibm
  				;;
  			-beos*)
-diff -urN hdf5-1.8.4.orig/bin/depcomp hdf5-1.8.4/bin/depcomp
---- hdf5-1.8.4.orig/bin/depcomp	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/bin/depcomp	2010-01-21 11:46:08.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/bin/depcomp hdf5-1.8.4-patch1/bin/depcomp
+--- hdf5-1.8.4-patch1.orig/bin/depcomp	2010-02-22 22:32:03.000000000 +0100
++++ hdf5-1.8.4-patch1/bin/depcomp	2010-03-11 15:58:10.000000000 +0100
 @@ -1,9 +1,10 @@
  #! /bin/sh
  # depcomp - compile a program generating dependencies as side-effects
@@ -13907,9 +14082,9 @@ diff -urN hdf5-1.8.4.orig/bin/depcomp hdf5-1.8.4/bin/depcomp
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-diff -urN hdf5-1.8.4.orig/bin/ltmain.sh hdf5-1.8.4/bin/ltmain.sh
---- hdf5-1.8.4.orig/bin/ltmain.sh	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/bin/ltmain.sh	2010-01-21 11:45:37.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/bin/ltmain.sh hdf5-1.8.4-patch1/bin/ltmain.sh
+--- hdf5-1.8.4-patch1.orig/bin/ltmain.sh	2010-02-22 22:32:03.000000000 +0100
++++ hdf5-1.8.4-patch1/bin/ltmain.sh	2010-03-11 15:57:38.000000000 +0100
 @@ -1,6 +1,6 @@
  # Generated from ltmain.m4sh.
  
@@ -14019,9 +14194,9 @@ diff -urN hdf5-1.8.4.orig/bin/ltmain.sh hdf5-1.8.4/bin/ltmain.sh
  	  esac
  	  ;;
  	no)
-diff -urN hdf5-1.8.4.orig/bin/missing hdf5-1.8.4/bin/missing
---- hdf5-1.8.4.orig/bin/missing	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/bin/missing	2010-01-21 11:45:54.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/bin/missing hdf5-1.8.4-patch1/bin/missing
+--- hdf5-1.8.4-patch1.orig/bin/missing	2010-02-22 22:32:03.000000000 +0100
++++ hdf5-1.8.4-patch1/bin/missing	2010-03-11 15:57:58.000000000 +0100
 @@ -1,10 +1,10 @@
  #! /bin/sh
  # Common stub for a few missing GNU programs while installing.
@@ -14320,9 +14495,9 @@ diff -urN hdf5-1.8.4.orig/bin/missing hdf5-1.8.4/bin/missing
 +# time-stamp-time-zone: "UTC"
 +# time-stamp-end: "; # UTC"
  # End:
-diff -urN hdf5-1.8.4.orig/bin/mkinstalldirs hdf5-1.8.4/bin/mkinstalldirs
---- hdf5-1.8.4.orig/bin/mkinstalldirs	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/bin/mkinstalldirs	2010-01-21 11:46:09.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/bin/mkinstalldirs hdf5-1.8.4-patch1/bin/mkinstalldirs
+--- hdf5-1.8.4-patch1.orig/bin/mkinstalldirs	2010-02-22 22:32:03.000000000 +0100
++++ hdf5-1.8.4-patch1/bin/mkinstalldirs	2010-03-11 15:58:11.000000000 +0100
 @@ -1,31 +1,59 @@
  #! /bin/sh
  # mkinstalldirs --- make directory hierarchy
@@ -14542,18 +14717,18 @@ diff -urN hdf5-1.8.4.orig/bin/mkinstalldirs hdf5-1.8.4/bin/mkinstalldirs
 +# time-stamp-end: "; # UTC"
  # End:
 -# mkinstalldirs ends here
-diff -urN hdf5-1.8.4.orig/c++/examples/Makefile.in hdf5-1.8.4/c++/examples/Makefile.in
---- hdf5-1.8.4.orig/c++/examples/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/c++/examples/Makefile.in	2010-01-21 11:45:55.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/c++/examples/Makefile.in hdf5-1.8.4-patch1/c++/examples/Makefile.in
+--- hdf5-1.8.4-patch1.orig/c++/examples/Makefile.in	2010-02-22 22:32:53.000000000 +0100
++++ hdf5-1.8.4-patch1/c++/examples/Makefile.in	2010-03-11 15:57:59.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/c++/Makefile.in hdf5-1.8.4/c++/Makefile.in
---- hdf5-1.8.4.orig/c++/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/c++/Makefile.in	2010-01-21 11:45:55.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/c++/Makefile.in hdf5-1.8.4-patch1/c++/Makefile.in
+--- hdf5-1.8.4-patch1.orig/c++/Makefile.in	2010-02-22 22:32:53.000000000 +0100
++++ hdf5-1.8.4-patch1/c++/Makefile.in	2010-03-11 15:57:59.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -14578,34 +14753,34 @@ diff -urN hdf5-1.8.4.orig/c++/Makefile.in hdf5-1.8.4/c++/Makefile.in
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/c++/src/Makefile.in hdf5-1.8.4/c++/src/Makefile.in
---- hdf5-1.8.4.orig/c++/src/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/c++/src/Makefile.in	2010-01-21 11:45:55.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/c++/src/Makefile.in hdf5-1.8.4-patch1/c++/src/Makefile.in
+--- hdf5-1.8.4-patch1.orig/c++/src/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/c++/src/Makefile.in	2010-03-11 15:57:59.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/c++/test/Makefile.in hdf5-1.8.4/c++/test/Makefile.in
---- hdf5-1.8.4.orig/c++/test/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/c++/test/Makefile.in	2010-01-21 11:45:56.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/c++/test/Makefile.in hdf5-1.8.4-patch1/c++/test/Makefile.in
+--- hdf5-1.8.4-patch1.orig/c++/test/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/c++/test/Makefile.in	2010-03-11 15:57:59.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
---- hdf5-1.8.4.orig/configure	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/configure	2010-01-21 11:45:47.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/configure hdf5-1.8.4-patch1/configure
+--- hdf5-1.8.4-patch1.orig/configure	2010-02-22 22:32:59.000000000 +0100
++++ hdf5-1.8.4-patch1/configure	2010-03-11 15:57:52.000000000 +0100
 @@ -1,13 +1,15 @@
  #! /bin/sh
--# From configure.in Id: configure.in 17841 2009-11-05 19:40:39Z acheng .
-+# From configure.in Id: configure.in 17851 2009-11-09 16:28:35Z epourmal .
+-# From configure.in Id: configure.in 17851 2009-11-09 16:28:35Z epourmal .
++# From configure.in Id: configure.in 18305 2010-02-22 21:45:48Z mamcgree .
  # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.64 for HDF5 1.8.4.
-+# Generated by GNU Autoconf 2.65 for HDF5 1.8.4.
+-# Generated by GNU Autoconf 2.64 for HDF5 1.8.4-patch1.
++# Generated by GNU Autoconf 2.65 for HDF5 1.8.4-patch1.
  #
  # Report bugs to <help at hdfgroup.org>.
  #
@@ -14641,7 +14816,7 @@ diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
 @@ -1829,7 +1832,7 @@
  if $ac_init_version; then
    cat <<\_ACEOF
- HDF5 configure 1.8.4
+ HDF5 configure 1.8.4-patch1
 -generated by GNU Autoconf 2.64
 +generated by GNU Autoconf 2.65
  
@@ -14758,7 +14933,7 @@ diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
 @@ -2913,7 +2916,7 @@
  running configure, to aid debugging if configure makes a mistake.
  
- It was created by HDF5 $as_me 1.8.4, which was
+ It was created by HDF5 $as_me 1.8.4-patch1, which was
 -generated by GNU Autoconf 2.64.  Invocation command line was
 +generated by GNU Autoconf 2.65.  Invocation command line was
  
@@ -15510,7 +15685,7 @@ diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
 @@ -28847,7 +28915,7 @@
  # values after options handling.
  ac_log="
- This file was extended by HDF5 $as_me 1.8.4, which was
+ This file was extended by HDF5 $as_me 1.8.4-patch1, which was
 -generated by GNU Autoconf 2.64.  Invocation command line was
 +generated by GNU Autoconf 2.65.  Invocation command line was
  
@@ -15530,7 +15705,7 @@ diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
- HDF5 config.status 1.8.4
+ HDF5 config.status 1.8.4-patch1
 -configured by $0, generated by GNU Autoconf 2.64,
 -  with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 +configured by $0, generated by GNU Autoconf 2.65,
@@ -15565,9 +15740,9 @@ diff -urN hdf5-1.8.4.orig/configure hdf5-1.8.4/configure
  t more2
  s/["\\]/\\&/g; s/^/"/; s/$/"/
  p
-diff -urN hdf5-1.8.4.orig/configure.in hdf5-1.8.4/configure.in
---- hdf5-1.8.4.orig/configure.in	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/configure.in	2010-01-21 11:44:33.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/configure.in hdf5-1.8.4-patch1/configure.in
+--- hdf5-1.8.4-patch1.orig/configure.in	2010-02-22 22:48:15.000000000 +0100
++++ hdf5-1.8.4-patch1/configure.in	2010-03-11 15:56:12.000000000 +0100
 @@ -1820,17 +1820,6 @@
                                [Enable thread safe capability])],
                THREADSAFE=$enableval)
@@ -15586,27 +15761,27 @@ diff -urN hdf5-1.8.4.orig/configure.in hdf5-1.8.4/configure.in
  case "X-$THREADSAFE" in
    X-|X-no)
      AC_MSG_RESULT([no])
-diff -urN hdf5-1.8.4.orig/examples/Makefile.in hdf5-1.8.4/examples/Makefile.in
---- hdf5-1.8.4.orig/examples/Makefile.in	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/examples/Makefile.in	2010-01-21 11:45:56.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/examples/Makefile.in hdf5-1.8.4-patch1/examples/Makefile.in
+--- hdf5-1.8.4-patch1.orig/examples/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/examples/Makefile.in	2010-03-11 15:58:00.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/fortran/examples/Makefile.in hdf5-1.8.4/fortran/examples/Makefile.in
---- hdf5-1.8.4.orig/fortran/examples/Makefile.in	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/fortran/examples/Makefile.in	2010-01-21 11:45:57.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/fortran/examples/Makefile.in hdf5-1.8.4-patch1/fortran/examples/Makefile.in
+--- hdf5-1.8.4-patch1.orig/fortran/examples/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/fortran/examples/Makefile.in	2010-03-11 15:58:00.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/fortran/Makefile.in hdf5-1.8.4/fortran/Makefile.in
---- hdf5-1.8.4.orig/fortran/Makefile.in	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/fortran/Makefile.in	2010-01-21 11:45:56.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/fortran/Makefile.in hdf5-1.8.4-patch1/fortran/Makefile.in
+--- hdf5-1.8.4-patch1.orig/fortran/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/fortran/Makefile.in	2010-03-11 15:58:00.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15631,45 +15806,45 @@ diff -urN hdf5-1.8.4.orig/fortran/Makefile.in hdf5-1.8.4/fortran/Makefile.in
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/fortran/src/Makefile.in hdf5-1.8.4/fortran/src/Makefile.in
---- hdf5-1.8.4.orig/fortran/src/Makefile.in	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/fortran/src/Makefile.in	2010-01-21 11:45:57.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/fortran/src/Makefile.in hdf5-1.8.4-patch1/fortran/src/Makefile.in
+--- hdf5-1.8.4-patch1.orig/fortran/src/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/fortran/src/Makefile.in	2010-03-11 15:58:00.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/fortran/test/Makefile.in hdf5-1.8.4/fortran/test/Makefile.in
---- hdf5-1.8.4.orig/fortran/test/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/fortran/test/Makefile.in	2010-01-21 11:45:58.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/fortran/test/Makefile.in hdf5-1.8.4-patch1/fortran/test/Makefile.in
+--- hdf5-1.8.4-patch1.orig/fortran/test/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/fortran/test/Makefile.in	2010-03-11 15:58:01.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/fortran/testpar/Makefile.in hdf5-1.8.4/fortran/testpar/Makefile.in
---- hdf5-1.8.4.orig/fortran/testpar/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/fortran/testpar/Makefile.in	2010-01-21 11:45:58.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/fortran/testpar/Makefile.in hdf5-1.8.4-patch1/fortran/testpar/Makefile.in
+--- hdf5-1.8.4-patch1.orig/fortran/testpar/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/fortran/testpar/Makefile.in	2010-03-11 15:58:01.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/c++/examples/Makefile.in hdf5-1.8.4/hl/c++/examples/Makefile.in
---- hdf5-1.8.4.orig/hl/c++/examples/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/c++/examples/Makefile.in	2010-01-21 11:45:59.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/c++/examples/Makefile.in hdf5-1.8.4-patch1/hl/c++/examples/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/c++/examples/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/c++/examples/Makefile.in	2010-03-11 15:58:02.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/c++/Makefile.in hdf5-1.8.4/hl/c++/Makefile.in
---- hdf5-1.8.4.orig/hl/c++/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/c++/Makefile.in	2010-01-21 11:45:59.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/c++/Makefile.in hdf5-1.8.4-patch1/hl/c++/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/c++/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/c++/Makefile.in	2010-03-11 15:58:02.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15694,45 +15869,45 @@ diff -urN hdf5-1.8.4.orig/hl/c++/Makefile.in hdf5-1.8.4/hl/c++/Makefile.in
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/hl/c++/src/Makefile.in hdf5-1.8.4/hl/c++/src/Makefile.in
---- hdf5-1.8.4.orig/hl/c++/src/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/c++/src/Makefile.in	2010-01-21 11:45:59.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/c++/src/Makefile.in hdf5-1.8.4-patch1/hl/c++/src/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/c++/src/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/c++/src/Makefile.in	2010-03-11 15:58:02.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/c++/test/Makefile.in hdf5-1.8.4/hl/c++/test/Makefile.in
---- hdf5-1.8.4.orig/hl/c++/test/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/c++/test/Makefile.in	2010-01-21 11:46:00.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/c++/test/Makefile.in hdf5-1.8.4-patch1/hl/c++/test/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/c++/test/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/c++/test/Makefile.in	2010-03-11 15:58:02.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/examples/Makefile.in hdf5-1.8.4/hl/examples/Makefile.in
---- hdf5-1.8.4.orig/hl/examples/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/examples/Makefile.in	2010-01-21 11:46:00.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/examples/Makefile.in hdf5-1.8.4-patch1/hl/examples/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/examples/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/examples/Makefile.in	2010-03-11 15:58:03.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/fortran/examples/Makefile.in hdf5-1.8.4/hl/fortran/examples/Makefile.in
---- hdf5-1.8.4.orig/hl/fortran/examples/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/fortran/examples/Makefile.in	2010-01-21 11:46:00.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/examples/Makefile.in hdf5-1.8.4-patch1/hl/fortran/examples/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/fortran/examples/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/fortran/examples/Makefile.in	2010-03-11 15:58:03.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/fortran/Makefile.in hdf5-1.8.4/hl/fortran/Makefile.in
---- hdf5-1.8.4.orig/hl/fortran/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/fortran/Makefile.in	2010-01-21 11:46:00.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/Makefile.in hdf5-1.8.4-patch1/hl/fortran/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/fortran/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/fortran/Makefile.in	2010-03-11 15:58:03.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15757,27 +15932,27 @@ diff -urN hdf5-1.8.4.orig/hl/fortran/Makefile.in hdf5-1.8.4/hl/fortran/Makefile.
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/hl/fortran/src/Makefile.in hdf5-1.8.4/hl/fortran/src/Makefile.in
---- hdf5-1.8.4.orig/hl/fortran/src/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/fortran/src/Makefile.in	2010-01-21 11:46:01.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/src/Makefile.in hdf5-1.8.4-patch1/hl/fortran/src/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/fortran/src/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/fortran/src/Makefile.in	2010-03-11 15:58:04.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/fortran/test/Makefile.in hdf5-1.8.4/hl/fortran/test/Makefile.in
---- hdf5-1.8.4.orig/hl/fortran/test/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/fortran/test/Makefile.in	2010-01-21 11:46:01.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/fortran/test/Makefile.in hdf5-1.8.4-patch1/hl/fortran/test/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/fortran/test/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/fortran/test/Makefile.in	2010-03-11 15:58:04.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/Makefile.in hdf5-1.8.4/hl/Makefile.in
---- hdf5-1.8.4.orig/hl/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/Makefile.in	2010-01-21 11:45:58.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/Makefile.in hdf5-1.8.4-patch1/hl/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/Makefile.in	2010-02-22 22:32:54.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/Makefile.in	2010-03-11 15:58:02.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15802,36 +15977,36 @@ diff -urN hdf5-1.8.4.orig/hl/Makefile.in hdf5-1.8.4/hl/Makefile.in
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/hl/src/Makefile.in hdf5-1.8.4/hl/src/Makefile.in
---- hdf5-1.8.4.orig/hl/src/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/src/Makefile.in	2010-01-21 11:46:01.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/src/Makefile.in hdf5-1.8.4-patch1/hl/src/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/src/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/src/Makefile.in	2010-03-11 15:58:04.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/test/Makefile.in hdf5-1.8.4/hl/test/Makefile.in
---- hdf5-1.8.4.orig/hl/test/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/test/Makefile.in	2010-01-21 11:46:02.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/test/Makefile.in hdf5-1.8.4-patch1/hl/test/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/test/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/test/Makefile.in	2010-03-11 15:58:04.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/tools/gif2h5/Makefile.in hdf5-1.8.4/hl/tools/gif2h5/Makefile.in
---- hdf5-1.8.4.orig/hl/tools/gif2h5/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/tools/gif2h5/Makefile.in	2010-01-21 11:46:02.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/tools/gif2h5/Makefile.in hdf5-1.8.4-patch1/hl/tools/gif2h5/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/tools/gif2h5/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/tools/gif2h5/Makefile.in	2010-03-11 15:58:05.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/hl/tools/Makefile.in hdf5-1.8.4/hl/tools/Makefile.in
---- hdf5-1.8.4.orig/hl/tools/Makefile.in	2009-11-10 22:12:08.000000000 +0100
-+++ hdf5-1.8.4/hl/tools/Makefile.in	2010-01-21 11:46:02.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/hl/tools/Makefile.in hdf5-1.8.4-patch1/hl/tools/Makefile.in
+--- hdf5-1.8.4-patch1.orig/hl/tools/Makefile.in	2010-02-22 22:32:55.000000000 +0100
++++ hdf5-1.8.4-patch1/hl/tools/Makefile.in	2010-03-11 15:58:05.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15856,9 +16031,9 @@ diff -urN hdf5-1.8.4.orig/hl/tools/Makefile.in hdf5-1.8.4/hl/tools/Makefile.in
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/Makefile.in hdf5-1.8.4/Makefile.in
---- hdf5-1.8.4.orig/Makefile.in	2009-11-10 22:12:10.000000000 +0100
-+++ hdf5-1.8.4/Makefile.in	2010-01-21 11:46:09.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/Makefile.in hdf5-1.8.4-patch1/Makefile.in
+--- hdf5-1.8.4-patch1.orig/Makefile.in	2010-02-22 22:32:59.000000000 +0100
++++ hdf5-1.8.4-patch1/Makefile.in	2010-03-11 15:58:11.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -15928,18 +16103,18 @@ diff -urN hdf5-1.8.4.orig/Makefile.in hdf5-1.8.4/Makefile.in
  	*.zip*) \
  	  unzip $(distdir).zip ;;\
  	esac
-diff -urN hdf5-1.8.4.orig/perform/Makefile.in hdf5-1.8.4/perform/Makefile.in
---- hdf5-1.8.4.orig/perform/Makefile.in	2009-11-10 22:12:09.000000000 +0100
-+++ hdf5-1.8.4/perform/Makefile.in	2010-01-21 11:46:03.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/perform/Makefile.in hdf5-1.8.4-patch1/perform/Makefile.in
+--- hdf5-1.8.4-patch1.orig/perform/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/perform/Makefile.in	2010-03-11 15:58:05.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/src/H5config.h.in hdf5-1.8.4/src/H5config.h.in
---- hdf5-1.8.4.orig/src/H5config.h.in	2009-11-10 22:12:02.000000000 +0100
-+++ hdf5-1.8.4/src/H5config.h.in	2010-01-21 11:45:53.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/src/H5config.h.in hdf5-1.8.4-patch1/src/H5config.h.in
+--- hdf5-1.8.4-patch1.orig/src/H5config.h.in	2010-02-22 22:31:54.000000000 +0100
++++ hdf5-1.8.4-patch1/src/H5config.h.in	2010-03-11 15:57:56.000000000 +0100
 @@ -301,7 +301,7 @@
  /* Define if `struct timezone' is defined */
  #undef HAVE_STRUCT_TIMEZONE
@@ -15949,9 +16124,9 @@ diff -urN hdf5-1.8.4.orig/src/H5config.h.in hdf5-1.8.4/src/H5config.h.in
  #undef HAVE_STRUCT_TM_TM_ZONE
  
  /* Define if `struct videoconfig' is defined */
-diff -urN hdf5-1.8.4.orig/src/H5config.h.in~ hdf5-1.8.4/src/H5config.h.in~
---- hdf5-1.8.4.orig/src/H5config.h.in~	1970-01-01 01:00:00.000000000 +0100
-+++ hdf5-1.8.4/src/H5config.h.in~	2010-01-21 11:34:18.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/src/H5config.h.in~ hdf5-1.8.4-patch1/src/H5config.h.in~
+--- hdf5-1.8.4-patch1.orig/src/H5config.h.in~	1970-01-01 01:00:00.000000000 +0100
++++ hdf5-1.8.4-patch1/src/H5config.h.in~	2010-02-22 22:31:54.000000000 +0100
 @@ -0,0 +1,680 @@
 +/* src/H5config.h.in.  Generated from configure.in by autoheader.  */
 +
@@ -16256,7 +16431,7 @@ diff -urN hdf5-1.8.4.orig/src/H5config.h.in~ hdf5-1.8.4/src/H5config.h.in~
 +/* Define if `struct timezone' is defined */
 +#undef HAVE_STRUCT_TIMEZONE
 +
-+/* Define to 1 if `tm_zone' is a member of `struct tm'. */
++/* Define to 1 if `struct tm' is a member of `tm_zone'. */
 +#undef HAVE_STRUCT_TM_TM_ZONE
 +
 +/* Define if `struct videoconfig' is defined */
@@ -16633,117 +16808,117 @@ diff -urN hdf5-1.8.4.orig/src/H5config.h.in~ hdf5-1.8.4/src/H5config.h.in~
 +
 +/* Define to `long' if <sys/types.h> does not define. */
 +#undef ssize_t
-diff -urN hdf5-1.8.4.orig/src/Makefile.in hdf5-1.8.4/src/Makefile.in
---- hdf5-1.8.4.orig/src/Makefile.in	2009-11-10 22:12:02.000000000 +0100
-+++ hdf5-1.8.4/src/Makefile.in	2010-01-21 11:46:03.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/src/Makefile.in hdf5-1.8.4-patch1/src/Makefile.in
+--- hdf5-1.8.4-patch1.orig/src/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/src/Makefile.in	2010-03-11 15:58:06.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/test/Makefile.in hdf5-1.8.4/test/Makefile.in
---- hdf5-1.8.4.orig/test/Makefile.in	2009-11-10 22:11:59.000000000 +0100
-+++ hdf5-1.8.4/test/Makefile.in	2010-01-21 11:46:04.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/test/Makefile.in hdf5-1.8.4-patch1/test/Makefile.in
+--- hdf5-1.8.4-patch1.orig/test/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/test/Makefile.in	2010-03-11 15:58:06.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/testpar/Makefile.in hdf5-1.8.4/testpar/Makefile.in
---- hdf5-1.8.4.orig/testpar/Makefile.in	2009-11-10 22:11:59.000000000 +0100
-+++ hdf5-1.8.4/testpar/Makefile.in	2010-01-21 11:46:05.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/testpar/Makefile.in hdf5-1.8.4-patch1/testpar/Makefile.in
+--- hdf5-1.8.4-patch1.orig/testpar/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/testpar/Makefile.in	2010-03-11 15:58:07.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5copy/Makefile.in hdf5-1.8.4/tools/h5copy/Makefile.in
---- hdf5-1.8.4.orig/tools/h5copy/Makefile.in	2009-11-10 22:12:04.000000000 +0100
-+++ hdf5-1.8.4/tools/h5copy/Makefile.in	2010-01-21 11:46:05.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5copy/Makefile.in hdf5-1.8.4-patch1/tools/h5copy/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5copy/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5copy/Makefile.in	2010-03-11 15:58:08.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5diff/Makefile.in hdf5-1.8.4/tools/h5diff/Makefile.in
---- hdf5-1.8.4.orig/tools/h5diff/Makefile.in	2009-11-10 22:12:04.000000000 +0100
-+++ hdf5-1.8.4/tools/h5diff/Makefile.in	2010-01-21 11:46:06.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5diff/Makefile.in hdf5-1.8.4-patch1/tools/h5diff/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5diff/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5diff/Makefile.in	2010-03-11 15:58:08.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5dump/Makefile.in hdf5-1.8.4/tools/h5dump/Makefile.in
---- hdf5-1.8.4.orig/tools/h5dump/Makefile.in	2009-11-10 22:12:03.000000000 +0100
-+++ hdf5-1.8.4/tools/h5dump/Makefile.in	2010-01-21 11:46:06.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5dump/Makefile.in hdf5-1.8.4-patch1/tools/h5dump/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5dump/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5dump/Makefile.in	2010-03-11 15:58:08.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5import/Makefile.in hdf5-1.8.4/tools/h5import/Makefile.in
---- hdf5-1.8.4.orig/tools/h5import/Makefile.in	2009-11-10 22:12:05.000000000 +0100
-+++ hdf5-1.8.4/tools/h5import/Makefile.in	2010-01-21 11:46:06.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5import/Makefile.in hdf5-1.8.4-patch1/tools/h5import/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5import/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5import/Makefile.in	2010-03-11 15:58:09.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5jam/Makefile.in hdf5-1.8.4/tools/h5jam/Makefile.in
---- hdf5-1.8.4.orig/tools/h5jam/Makefile.in	2009-11-10 22:12:04.000000000 +0100
-+++ hdf5-1.8.4/tools/h5jam/Makefile.in	2010-01-21 11:46:07.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5jam/Makefile.in hdf5-1.8.4-patch1/tools/h5jam/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5jam/Makefile.in	2010-02-22 22:32:57.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5jam/Makefile.in	2010-03-11 15:58:09.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5ls/Makefile.in hdf5-1.8.4/tools/h5ls/Makefile.in
---- hdf5-1.8.4.orig/tools/h5ls/Makefile.in	2009-11-10 22:12:05.000000000 +0100
-+++ hdf5-1.8.4/tools/h5ls/Makefile.in	2010-01-21 11:46:07.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5ls/Makefile.in hdf5-1.8.4-patch1/tools/h5ls/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5ls/Makefile.in	2010-02-22 22:32:57.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5ls/Makefile.in	2010-03-11 15:58:09.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5repack/Makefile.in hdf5-1.8.4/tools/h5repack/Makefile.in
---- hdf5-1.8.4.orig/tools/h5repack/Makefile.in	2009-11-10 22:12:03.000000000 +0100
-+++ hdf5-1.8.4/tools/h5repack/Makefile.in	2010-01-21 11:46:07.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5repack/Makefile.in hdf5-1.8.4-patch1/tools/h5repack/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5repack/Makefile.in	2010-02-22 22:32:57.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5repack/Makefile.in	2010-03-11 15:58:10.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/h5stat/Makefile.in hdf5-1.8.4/tools/h5stat/Makefile.in
---- hdf5-1.8.4.orig/tools/h5stat/Makefile.in	2009-11-10 22:12:05.000000000 +0100
-+++ hdf5-1.8.4/tools/h5stat/Makefile.in	2010-01-21 11:46:08.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/h5stat/Makefile.in hdf5-1.8.4-patch1/tools/h5stat/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/h5stat/Makefile.in	2010-02-22 22:32:57.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/h5stat/Makefile.in	2010-03-11 15:58:10.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/lib/Makefile.in hdf5-1.8.4/tools/lib/Makefile.in
---- hdf5-1.8.4.orig/tools/lib/Makefile.in	2009-11-10 22:12:04.000000000 +0100
-+++ hdf5-1.8.4/tools/lib/Makefile.in	2010-01-21 11:46:08.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/lib/Makefile.in hdf5-1.8.4-patch1/tools/lib/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/lib/Makefile.in	2010-02-22 22:32:57.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/lib/Makefile.in	2010-03-11 15:58:10.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
  # @configure_input@
  
  # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-diff -urN hdf5-1.8.4.orig/tools/Makefile.in hdf5-1.8.4/tools/Makefile.in
---- hdf5-1.8.4.orig/tools/Makefile.in	2009-11-10 22:12:05.000000000 +0100
-+++ hdf5-1.8.4/tools/Makefile.in	2010-01-21 11:46:05.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/Makefile.in hdf5-1.8.4-patch1/tools/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/Makefile.in	2010-02-22 22:32:56.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/Makefile.in	2010-03-11 15:58:07.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
@@ -16768,9 +16943,9 @@ diff -urN hdf5-1.8.4.orig/tools/Makefile.in hdf5-1.8.4/tools/Makefile.in
  	for f in x $$MAKEFLAGS; do \
  	  case $$f in \
  	    *=* | --[!k]*);; \
-diff -urN hdf5-1.8.4.orig/tools/misc/Makefile.in hdf5-1.8.4/tools/misc/Makefile.in
---- hdf5-1.8.4.orig/tools/misc/Makefile.in	2009-11-10 22:12:05.000000000 +0100
-+++ hdf5-1.8.4/tools/misc/Makefile.in	2010-01-21 11:46:09.000000000 +0100
+diff -urN hdf5-1.8.4-patch1.orig/tools/misc/Makefile.in hdf5-1.8.4-patch1/tools/misc/Makefile.in
+--- hdf5-1.8.4-patch1.orig/tools/misc/Makefile.in	2010-02-22 22:32:57.000000000 +0100
++++ hdf5-1.8.4-patch1/tools/misc/Makefile.in	2010-03-11 15:58:11.000000000 +0100
 @@ -1,4 +1,4 @@
 -# Makefile.in generated by automake 1.11 from Makefile.am.
 +# Makefile.in generated by automake 1.11.1 from Makefile.am.
diff --git a/debian/rules b/debian/rules
index 039346e..a4b9516 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@
 
 package = libhdf5
 pkgversion ?= $(shell dpkg-parsechangelog | awk '/^Version:/ {print $$2}')
-version ?= $(shell echo $(pkgversion) | sed 's/-[^-]*$$//')
+version ?= $(shell echo $(pkgversion) | sed 's/\([0-9\.]\)-.*$$/\1/')
 major_version = $(shell echo $(version) | cut -d. -f1,2)
 serpack = $(package)-serial-$(version)
 lampack = $(package)-lam-$(version)

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list