[SCM] hdf5 branch, master, updated. upstream/1.8.7-139-gb94f3ea

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit b94f3eabbb173689534ba1b589640955f2e15885
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Sun Nov 25 11:02:42 2012 +0100

    relax-version-check.patch: don't check the compile time patch version at runtime, this saves us full transitions when it is still compatible. (Closes: #693610)

diff --git a/debian/changelog b/debian/changelog
index b9253bd..21ea1b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+hdf5 (1.8.9-1~exp2) experimental; urgency=low
+
+  [ Julian Taylor ]
+  * relax-version-check.patch:
+    don't check the compile time patch version at runtime, this saves us
+    full transitions when it is still compatible.
+    (Closes: #693610)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 25 Nov 2012 11:01:16 +0100
+
 hdf5 (1.8.9-1~exp1) experimental; urgency=low
 
   * New upstream release (Closes: #673788)
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
new file mode 100644
index 0000000..02d5d16
--- /dev/null
+++ b/debian/patches/relax-version-check.patch
@@ -0,0 +1,20 @@
+Description: remove check on patch version
+ hopefully changes in that number always are compatible.
+ Without this every bugfix update would require a full transition as it will
+ abort when the version does not match exactly.
+ The version check will be executed with compile time values on every file
+ access see e.g. H5F_ACC_RDONLY in src/H5Fpublic.h
+Author: Julian Taylor <jtaylor at ubuntu.com>
+
+--- a/src/H5.c
++++ b/src/H5.c
+@@ -665,8 +665,7 @@
+             disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
+     }
+ 
+-    if (H5_VERS_MAJOR!=majnum || H5_VERS_MINOR!=minnum ||
+-            H5_VERS_RELEASE!=relnum) {
++    if (H5_VERS_MAJOR!=majnum || H5_VERS_MINOR!=minnum) {
+         switch (disable_version_check) {
+ 	case 0:
+ 	    HDfprintf(stderr, "%s%s", version_mismatch_warning,
diff --git a/debian/patches/series b/debian/patches/series
index 6ceccb5..5a310ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 mpi.diff
 path_max.diff
 ullong_force.diff
+relax-version-check.patch

-- 
Hierarchical Data Format 5 (HDF5)