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

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

The following commit has been merged in the master branch:
commit 06f835a3f2275d96b20a5345cef6017f102a8dda
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Tue Jul 2 16:38:40 2013 +0200

    refresh of the patches

diff --git a/debian/patches/path_max.diff b/debian/patches/path_max.diff
index d8d3466..2e2b0fc 100644
--- a/debian/patches/path_max.diff
+++ b/debian/patches/path_max.diff
@@ -1,7 +1,7 @@
-Index: hdf5-1.8.11/src/H5F.c
+Index: hdf5/src/H5F.c
 ===================================================================
---- hdf5-1.8.11.orig/src/H5F.c	2013-06-21 14:04:50.332202606 +0200
-+++ hdf5-1.8.11/src/H5F.c	2013-06-21 14:04:50.332202606 +0200
+--- 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
 @@ -129,6 +129,10 @@
  }};
  
@@ -13,13 +13,13 @@ Index: hdf5-1.8.11/src/H5F.c
  

  /*-------------------------------------------------------------------------
   * Function:	H5F_init
-Index: hdf5-1.8.11/testpar/t_cache.c
+Index: hdf5/testpar/t_cache.c
 ===================================================================
---- hdf5-1.8.11.orig/testpar/t_cache.c	2013-06-21 14:04:50.332202606 +0200
-+++ hdf5-1.8.11/testpar/t_cache.c	2013-06-21 14:04:50.332202606 +0200
-@@ -35,6 +35,10 @@
- 
- #include "H5Fpkg.h"
+--- 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 */
  
 +#ifndef PATH_MAX
 +#define PATH_MAX    512
diff --git a/debian/patches/relax-version-check.patch b/debian/patches/relax-version-check.patch
index 49da78d..4c55d9c 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-1.8.11/src/H5.c
+Index: hdf5/src/H5.c
 ===================================================================
---- hdf5-1.8.11.orig/src/H5.c	2013-06-21 14:04:51.464202633 +0200
-+++ hdf5-1.8.11/src/H5.c	2013-06-21 14:04:51.464202633 +0200
+--- 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
 @@ -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 adba680..b84a5fa 100644
--- a/debian/patches/skip_cxx_inclusion.diff
+++ b/debian/patches/skip_cxx_inclusion.diff
@@ -1,7 +1,7 @@
-Index: hdf5-1.8.11/src/H5public.h
+Index: hdf5/src/H5public.h
 ===================================================================
---- hdf5-1.8.11.orig/src/H5public.h	2013-06-21 14:04:51.860202643 +0200
-+++ hdf5-1.8.11/src/H5public.h	2013-06-21 14:04:51.860202643 +0200
+--- 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
 @@ -58,6 +58,8 @@
  #   include <stddef.h>
  #endif
@@ -9,5 +9,5 @@ Index: hdf5-1.8.11/src/H5public.h
 +#   define MPICH_SKIP_MPICXX 1
 +#   define OMPI_SKIP_MPICXX 1
  #   include <mpi.h>
- #ifndef MPI_FILE_NULL		/*MPIO may be defined in mpi.h already       */
- #   include <mpio.h>
+ #endif
+ 
diff --git a/debian/patches/soname.diff b/debian/patches/soname.diff
index 2ac379d..99d9589 100644
--- a/debian/patches/soname.diff
+++ b/debian/patches/soname.diff
@@ -1,7 +1,7 @@
 Index: hdf5/c++/src/Makefile.in
 ===================================================================
---- hdf5.orig/c++/src/Makefile.in	2013-06-21 11:25:27.587954635 +0200
-+++ hdf5/c++/src/Makefile.in	2013-07-02 14:54:16.297409399 +0200
+--- 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
 @@ -466,7 +466,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -13,8 +13,8 @@ Index: hdf5/c++/src/Makefile.in
  
 Index: hdf5/config/lt_vers.am
 ===================================================================
---- hdf5.orig/config/lt_vers.am	2013-06-21 11:25:27.591954634 +0200
-+++ hdf5/config/lt_vers.am	2013-07-02 14:54:29.865409829 +0200
+--- 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
 @@ -16,7 +16,7 @@
  ##
  # Add libtool shared library version numbers to the HDF5 library
@@ -26,8 +26,8 @@ Index: hdf5/config/lt_vers.am
  
 Index: hdf5/fortran/src/Makefile.in
 ===================================================================
---- hdf5.orig/fortran/src/Makefile.in	2013-06-21 11:25:27.607954636 +0200
-+++ hdf5/fortran/src/Makefile.in	2013-07-02 14:54:13.145409297 +0200
+--- 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
 @@ -517,7 +517,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -39,8 +39,8 @@ Index: hdf5/fortran/src/Makefile.in
  
 Index: hdf5/hl/c++/src/Makefile.in
 ===================================================================
---- hdf5.orig/hl/c++/src/Makefile.in	2013-06-21 11:25:27.611954636 +0200
-+++ hdf5/hl/c++/src/Makefile.in	2013-07-02 14:54:11.465409245 +0200
+--- 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
 @@ -457,7 +457,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -52,8 +52,8 @@ Index: hdf5/hl/c++/src/Makefile.in
  
 Index: hdf5/hl/fortran/src/Makefile.in
 ===================================================================
---- hdf5.orig/hl/fortran/src/Makefile.in	2013-06-21 11:25:27.615954636 +0200
-+++ hdf5/hl/fortran/src/Makefile.in	2013-07-02 14:54:24.201409649 +0200
+--- 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
 @@ -473,7 +473,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -65,8 +65,8 @@ Index: hdf5/hl/fortran/src/Makefile.in
  INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
 Index: hdf5/hl/src/Makefile.in
 ===================================================================
---- hdf5.orig/hl/src/Makefile.in	2013-06-21 11:25:27.615954636 +0200
-+++ hdf5/hl/src/Makefile.in	2013-07-02 14:54:20.145409520 +0200
+--- 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
 @@ -456,7 +456,7 @@
  
  # Add libtool shared library version numbers to the HDF5 library
@@ -78,8 +78,8 @@ Index: hdf5/hl/src/Makefile.in
  
 Index: hdf5/src/Makefile.in
 ===================================================================
---- hdf5.orig/src/Makefile.in	2013-06-21 11:25:27.659954637 +0200
-+++ hdf5/src/Makefile.in	2013-07-02 14:54:09.541409183 +0200
+--- 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
 @@ -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 e1feeb9..a5a389c 100644
--- a/debian/patches/ullong_force.diff
+++ b/debian/patches/ullong_force.diff
@@ -1,7 +1,7 @@
-Index: hdf5-1.8.11/src/H5Tconv.c
+Index: hdf5/src/H5Tconv.c
 ===================================================================
---- hdf5-1.8.11.orig/src/H5Tconv.c	2013-06-21 14:04:50.992202620 +0200
-+++ hdf5-1.8.11/src/H5Tconv.c	2013-06-21 14:04:50.992202620 +0200
+--- 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
 @@ -7873,7 +7873,6 @@
   *
   *-------------------------------------------------------------------------

-- 
Hierarchical Data Format 5 (HDF5)

More information about the Pkg-grass-devel mailing list