[SCM] hdf5 branch, master, updated. upstream/1.8.7-165-gc52b044

Sylvestre Ledru sylvestre.ledru at scilab-enterprises.com
Tue Jul 2 15:31:20 UTC 2013 

The following commit has been merged in the master branch:
commit c52b044dffc7fbc350b61ce8538c61885ae9883c
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Tue Jul 2 17:31:15 2013 +0200

    Refresh + prepare the upload

diff --git a/debian/changelog b/debian/changelog
index 5e813f3..00268ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-hdf5 (1.8.11-1~exp1) experimental; urgency=low
+hdf5 (1.8.11-1) unstable; urgency=low
 
   * New upstream release
   * Rollback upstream change from soname 7 => 8.
diff --git a/debian/libhdf5-7.symbols b/debian/libhdf5-7.symbols
index f21a38e..1815ccf 100644
--- a/debian/libhdf5-7.symbols
+++ b/debian/libhdf5-7.symbols
@@ -524,7 +524,6 @@ libhdf5.so.7 libhdf5-7
  H5FD_init at Base 1.8.7
  H5FD_log_init at Base 1.8.7
  H5FD_log_term at Base 1.8.7
-#MISSING: 1.8.11-1~exp1# H5FD_mpi_native_g at Base 1.8.7
  H5FD_multi_init at Base 1.8.7
  H5FD_multi_term at Base 1.8.7
  H5FD_open at Base 1.8.7
@@ -1510,7 +1509,6 @@ libhdf5.so.7 libhdf5-7
  H5Pget_data_transform at Base 1.8.7
  H5Pget_driver at Base 1.8.7
  H5Pget_driver_info at Base 1.8.7
-#MISSING: 1.8.11-1~exp1# H5Pget_dxpl_multi at Base 1.8.7
  H5Pget_edc_check at Base 1.8.7
  H5Pget_elink_acc_flags at Base 1.8.7
  H5Pget_elink_cb at Base 1.8.7
@@ -1587,7 +1585,6 @@ libhdf5.so.7 libhdf5-7
  H5Pset_data_transform at Base 1.8.7
  H5Pset_deflate at Base 1.8.7
  H5Pset_driver at Base 1.8.7
-#MISSING: 1.8.11-1~exp1# H5Pset_dxpl_multi at Base 1.8.7
  H5Pset_edc_check at Base 1.8.7
  H5Pset_elink_acc_flags at Base 1.8.7
  H5Pset_elink_cb at Base 1.8.7
@@ -2475,10 +2472,8 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
  (optional)_ZN2H511IdComponentD1Ev at Base 1.8.9
  (optional)_ZN2H511IdComponentD2Ev at Base 1.8.9
  (optional)_ZN2H511IdComponentaSERKS0_ at Base 1.8.9
- _ZN2H514FileIExceptionC1ERKS0_ at Base 1.8.11-1~exp1
  (optional)_ZN2H514FileIExceptionC1ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H514FileIExceptionC1Ev at Base 1.8.9
- _ZN2H514FileIExceptionC2ERKS0_ at Base 1.8.11-1~exp1
  (optional)_ZN2H514FileIExceptionC2ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H514FileIExceptionC2Ev at Base 1.8.9
  (optional)_ZN2H514FileIExceptionD0Ev at Base 1.8.9
@@ -2519,10 +2514,8 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
  (optional)_ZN2H517DSetCreatPropListD0Ev at Base 1.8.9
  (optional)_ZN2H517DSetCreatPropListD1Ev at Base 1.8.9
  (optional)_ZN2H517DSetCreatPropListD2Ev at Base 1.8.9
- (optional)_ZN2H517DataSetIExceptionC1ERKS0_ at Base 1.8.9
  (optional)_ZN2H517DataSetIExceptionC1ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H517DataSetIExceptionC1Ev at Base 1.8.9
- (optional)_ZN2H517DataSetIExceptionC2ERKS0_ at Base 1.8.9
  (optional)_ZN2H517DataSetIExceptionC2ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H517DataSetIExceptionC2Ev at Base 1.8.9
  (optional)_ZN2H517DataSetIExceptionD0Ev at Base 1.8.9
@@ -2545,10 +2538,8 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
  (optional)_ZN2H517LibraryIExceptionD0Ev at Base 1.8.9
  (optional)_ZN2H517LibraryIExceptionD1Ev at Base 1.8.9
  (optional)_ZN2H517LibraryIExceptionD2Ev at Base 1.8.9
- (optional)_ZN2H518DataTypeIExceptionC1ERKS0_ at Base 1.8.9
  (optional)_ZN2H518DataTypeIExceptionC1ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H518DataTypeIExceptionC1Ev at Base 1.8.9
- (optional)_ZN2H518DataTypeIExceptionC2ERKS0_ at Base 1.8.9
  (optional)_ZN2H518DataTypeIExceptionC2ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H518DataTypeIExceptionC2Ev at Base 1.8.9
  (optional)_ZN2H518DataTypeIExceptionD0Ev at Base 1.8.9
@@ -2561,19 +2552,15 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
  (optional)_ZN2H518PropListIExceptionD0Ev at Base 1.8.9
  (optional)_ZN2H518PropListIExceptionD1Ev at Base 1.8.9
  (optional)_ZN2H518PropListIExceptionD2Ev at Base 1.8.9
- (optional)_ZN2H518ReferenceExceptionC1ERKS0_ at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionC1ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionC1Ev at Base 1.8.9
- (optional)_ZN2H518ReferenceExceptionC2ERKS0_ at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionC2ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionC2Ev at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionD0Ev at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionD1Ev at Base 1.8.9
  (optional)_ZN2H518ReferenceExceptionD2Ev at Base 1.8.9
- (optional)_ZN2H519AttributeIExceptionC1ERKS0_ at Base 1.8.9
  (optional)_ZN2H519AttributeIExceptionC1ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H519AttributeIExceptionC1Ev at Base 1.8.9
- (optional)_ZN2H519AttributeIExceptionC2ERKS0_ at Base 1.8.9
  (optional)_ZN2H519AttributeIExceptionC2ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H519AttributeIExceptionC2Ev at Base 1.8.9
  (optional)_ZN2H519AttributeIExceptionD0Ev at Base 1.8.9
@@ -2586,8 +2573,6 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
  (optional)_ZN2H519DSetMemXferPropList21getSmallDataBlockSizeEv at Base 1.8.9
  (optional)_ZN2H519DSetMemXferPropList21setSmallDataBlockSizeEy at Base 1.8.9
  (optional)_ZN2H519DSetMemXferPropList7DEFAULTE at Base 1.8.9
-#MISSING: 1.8.11-1~exp1# (optional)_ZN2H519DSetMemXferPropList8getMultiEPi at Base 1.8.9
-#MISSING: 1.8.11-1~exp1# (optional)_ZN2H519DSetMemXferPropList8setMultiEPKi at Base 1.8.9
  (optional)_ZN2H519DSetMemXferPropListC1ERKS0_ at Base 1.8.9
  (optional)_ZN2H519DSetMemXferPropListC1Ei at Base 1.8.9
  (optional)_ZN2H519DSetMemXferPropListC1Ev at Base 1.8.9
@@ -2604,10 +2589,8 @@ libhdf5_cpp.so.7 libhdf5-7 #MINVER#
  (optional)_ZN2H519DataSpaceIExceptionD0Ev at Base 1.8.9
  (optional)_ZN2H519DataSpaceIExceptionD1Ev at Base 1.8.9
  (optional)_ZN2H519DataSpaceIExceptionD2Ev at Base 1.8.9
- (optional)_ZN2H520IdComponentExceptionC1ERKS0_ at Base 1.8.9
  (optional)_ZN2H520IdComponentExceptionC1ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H520IdComponentExceptionC1Ev at Base 1.8.9
- (optional)_ZN2H520IdComponentExceptionC2ERKS0_ at Base 1.8.9
  (optional)_ZN2H520IdComponentExceptionC2ERKSsS2_ at Base 1.8.9
  (optional)_ZN2H520IdComponentExceptionC2Ev at Base 1.8.9
  (optional)_ZN2H520IdComponentExceptionD0Ev at Base 1.8.9
diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index 2e2b0fc..b8527f0 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -1,7 +1,7 @@
-Index: hdf5/src/H5F.c
+Index: hdf5-1.8.11/src/H5F.c
 ===================================================================
---- hdf5.orig/src/H5F.c	2013-07-02 16:36:13.277603729 +0200
-+++ hdf5/src/H5F.c	2013-07-02 16:36:13.273603730 +0200
+--- hdf5-1.8.11.orig/src/H5F.c	2013-07-02 16:40:55.621612700 +0200
++++ hdf5-1.8.11/src/H5F.c	2013-07-02 16:40:55.613612700 +0200
 @@ -129,6 +129,10 @@
  }};
  
@@ -13,13 +13,13 @@ Index: hdf5/src/H5F.c
  

  /*-------------------------------------------------------------------------
   * Function:	H5F_init
-Index: hdf5/testpar/t_cache.c
+Index: hdf5-1.8.11/testpar/t_cache.c
 ===================================================================
---- hdf5.orig/testpar/t_cache.c	2013-07-02 16:36:13.277603729 +0200
-+++ hdf5/testpar/t_cache.c	2013-07-02 16:36:13.273603730 +0200
-@@ -39,6 +39,10 @@
- #define PATH_MAX    512
- #endif  /* !PATH_MAX */
+--- hdf5-1.8.11.orig/testpar/t_cache.c	2013-07-02 16:40:55.621612700 +0200
++++ hdf5-1.8.11/testpar/t_cache.c	2013-07-02 16:40:55.617612700 +0200
+@@ -35,6 +35,10 @@
+ 
+ #include "H5Fpkg.h"
  
 +#ifndef PATH_MAX
 +#define PATH_MAX    512
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
index 4c55d9c..a32ed5b 100644
--- a/debian/patches/relax-version-check.patch
+++ b/debian/patches/relax-version-check.patch
@@ -6,10 +6,10 @@ Description: remove check on patch version
  access see e.g. H5F_ACC_RDONLY in src/H5Fpublic.h
 Author: Julian Taylor <jtaylor at ubuntu.com>
 
-Index: hdf5/src/H5.c
+Index: hdf5-1.8.11/src/H5.c
 ===================================================================
---- hdf5.orig/src/H5.c	2013-07-02 16:36:13.909603750 +0200
-+++ hdf5/src/H5.c	2013-07-02 16:36:13.905603749 +0200
+--- hdf5-1.8.11.orig/src/H5.c	2013-07-02 16:40:56.945612741 +0200
++++ hdf5-1.8.11/src/H5.c	2013-07-02 16:40:56.941612742 +0200
 @@ -666,8 +666,7 @@
              disable_version_check = (unsigned int)HDstrtol (s, NULL, 0);
      }
diff --git a/debian/patches/skip_cxx_inclusion.diff b/debian/patches/skip_cxx_inclusion.diff
index b84a5fa..83293e0 100644
--- a/debian/patches/skip_cxx_inclusion.diff
+++ b/debian/patches/skip_cxx_inclusion.diff
@@ -1,7 +1,7 @@
-Index: hdf5/src/H5public.h
+Index: hdf5-1.8.11/src/H5public.h
 ===================================================================
---- hdf5.orig/src/H5public.h	2013-07-02 16:36:14.101603756 +0200
-+++ hdf5/src/H5public.h	2013-07-02 16:36:14.097603755 +0200
+--- hdf5-1.8.11.orig/src/H5public.h	2013-07-02 16:40:57.269612753 +0200
++++ hdf5-1.8.11/src/H5public.h	2013-07-02 16:40:57.269612753 +0200
 @@ -58,6 +58,8 @@
  #   include <stddef.h>
  #endif
@@ -9,5 +9,5 @@ Index: hdf5/src/H5public.h
 +#   define MPICH_SKIP_MPICXX 1
 +#   define OMPI_SKIP_MPICXX 1
  #   include <mpi.h>
- #endif
- 
+ #ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
+ #   include <mpio.h>
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
index 99d9589..aaccf10 100644
--- a/debian/patches/soname.diff
+++ b/debian/patches/soname.diff
@@ -1,7 +1,7 @@
-Index: hdf5/c++/src/Makefile.in
+Index: hdf5-1.8.11/c++/src/Makefile.in
 ===================================================================
---- hdf5.orig/c++/src/Makefile.in	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/c++/src/Makefile.in	2013-07-02 16:36:14.289603762 +0200
+--- hdf5-1.8.11.orig/c++/src/Makefile.in	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/c++/src/Makefile.in	2013-07-02 16:40:57.601612763 +0200
 @@ -466,7 +466,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -11,10 +11,10 @@ Index: hdf5/c++/src/Makefile.in
  LT_VERS_REVISION = 0
  LT_VERS_AGE = 0
  
-Index: hdf5/config/lt_vers.am
+Index: hdf5-1.8.11/config/lt_vers.am
 ===================================================================
---- hdf5.orig/config/lt_vers.am	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/config/lt_vers.am	2013-07-02 16:36:14.289603762 +0200
+--- hdf5-1.8.11.orig/config/lt_vers.am	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/config/lt_vers.am	2013-07-02 16:40:57.601612763 +0200
 @@ -16,7 +16,7 @@
  ##
  # Add libtool shared library version numbers to the HDF5 library
@@ -24,10 +24,10 @@ Index: hdf5/config/lt_vers.am
  LT_VERS_REVISION = 0
  LT_VERS_AGE = 0
  
-Index: hdf5/fortran/src/Makefile.in
+Index: hdf5-1.8.11/fortran/src/Makefile.in
 ===================================================================
---- hdf5.orig/fortran/src/Makefile.in	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/fortran/src/Makefile.in	2013-07-02 16:36:14.289603762 +0200
+--- hdf5-1.8.11.orig/fortran/src/Makefile.in	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/fortran/src/Makefile.in	2013-07-02 16:40:57.601612763 +0200
 @@ -517,7 +517,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -37,10 +37,10 @@ Index: hdf5/fortran/src/Makefile.in
  LT_VERS_REVISION = 0
  LT_VERS_AGE = 0
  
-Index: hdf5/hl/c++/src/Makefile.in
+Index: hdf5-1.8.11/hl/c++/src/Makefile.in
 ===================================================================
---- hdf5.orig/hl/c++/src/Makefile.in	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/hl/c++/src/Makefile.in	2013-07-02 16:36:14.289603762 +0200
+--- hdf5-1.8.11.orig/hl/c++/src/Makefile.in	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/hl/c++/src/Makefile.in	2013-07-02 16:40:57.601612763 +0200
 @@ -457,7 +457,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -50,10 +50,10 @@ Index: hdf5/hl/c++/src/Makefile.in
  LT_VERS_REVISION = 0
  LT_VERS_AGE = 0
  
-Index: hdf5/hl/fortran/src/Makefile.in
+Index: hdf5-1.8.11/hl/fortran/src/Makefile.in
 ===================================================================
---- hdf5.orig/hl/fortran/src/Makefile.in	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/hl/fortran/src/Makefile.in	2013-07-02 16:36:14.289603762 +0200
+--- hdf5-1.8.11.orig/hl/fortran/src/Makefile.in	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/hl/fortran/src/Makefile.in	2013-07-02 16:40:57.601612763 +0200
 @@ -473,7 +473,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -63,10 +63,10 @@ Index: hdf5/hl/fortran/src/Makefile.in
  LT_VERS_REVISION = 0
  LT_VERS_AGE = 0
  INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-Index: hdf5/hl/src/Makefile.in
+Index: hdf5-1.8.11/hl/src/Makefile.in
 ===================================================================
---- hdf5.orig/hl/src/Makefile.in	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/hl/src/Makefile.in	2013-07-02 16:36:14.293603763 +0200
+--- hdf5-1.8.11.orig/hl/src/Makefile.in	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/hl/src/Makefile.in	2013-07-02 16:40:57.601612763 +0200
 @@ -456,7 +456,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -76,10 +76,10 @@ Index: hdf5/hl/src/Makefile.in
  LT_VERS_REVISION = 0
  LT_VERS_AGE = 0
  
-Index: hdf5/src/Makefile.in
+Index: hdf5-1.8.11/src/Makefile.in
 ===================================================================
---- hdf5.orig/src/Makefile.in	2013-07-02 16:36:14.297603763 +0200
-+++ hdf5/src/Makefile.in	2013-07-02 16:36:14.293603763 +0200
+--- hdf5-1.8.11.orig/src/Makefile.in	2013-07-02 16:40:57.605612763 +0200
++++ hdf5-1.8.11/src/Makefile.in	2013-07-02 16:40:57.601612763 +0200
 @@ -516,7 +516,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
diff --git a/debian/patches/ullong_force.diff b/debian/patches/ullong_force.diff
index a5a389c..574835e 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -1,7 +1,7 @@
-Index: hdf5/src/H5Tconv.c
+Index: hdf5-1.8.11/src/H5Tconv.c
 ===================================================================
---- hdf5.orig/src/H5Tconv.c	2013-07-02 16:36:13.701603744 +0200
-+++ hdf5/src/H5Tconv.c	2013-07-02 16:36:13.697603744 +0200
+--- hdf5-1.8.11.orig/src/H5Tconv.c	2013-07-02 16:40:56.473612726 +0200
++++ hdf5-1.8.11/src/H5Tconv.c	2013-07-02 16:40:56.473612726 +0200
 @@ -7873,7 +7873,6 @@
   *
   *-------------------------------------------------------------------------

-- 
Hierarchical Data Format 5 (HDF5)

More information about the Pkg-grass-devel mailing list