[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-84-g0484cab

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 0484cab32d33ae996f5e50bcd75eb196afbc89bc
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Wed Nov 16 11:43:40 2011 +0100

      * New upstream release
      * sscanf.diff & disabler16check.diff removed (applied upstream)

diff --git a/debian/changelog b/debian/changelog
index 5c483f7..a29782a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+hdf5 (1.8.8-1~exp1) experimental; urgency=low
+
+  * New upstream release
+  * sscanf.diff & disabler16check.diff removed (applied upstream)
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Wed, 16 Nov 2011 11:42:52 +0100
+
 hdf5 (1.8.7-2~exp7) experimental; urgency=low
 
   * Fix a mistake in the powerpc symbol file
diff --git a/debian/patches/disabler16check.diff b/debian/patches/disabler16check.diff
deleted file mode 100644
index c789412..0000000
--- a/debian/patches/disabler16check.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/fortran/src/H5test_kind_SIZEOF.f90 b/fortran/src/H5test_kind_SIZEOF.f90
-index fbbe8e9..8df481e 100644
---- a/fortran/src/H5test_kind_SIZEOF.f90
-+++ b/fortran/src/H5test_kind_SIZEOF.f90
-@@ -124,7 +124,11 @@ WRITE(*,'(40(A,/))') &
-   ENDDO
-   DO i = 1, ir
-      j = rkind_numbers(i)
--     WRITE(*, "("" CALL r"", i2.2,""()"")") j
-+     IF(j .NE. 16) THEN
-+! Disable the kind 16 check
-+! See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619281
-+        WRITE(*, "("" CALL r"", i2.2,""()"")") j
-+     ENDIF
-   ENDDO
-   WRITE(*,*) "END PROGRAM int_kind"
-   j = 0
-@@ -175,16 +179,20 @@ WRITE(*,'(40(A,/))') &
-   ENDDO
-   DO i = 1, ir
-      j = rkind_numbers(i)
--     WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
--     WRITE(*,*)"   IMPLICIT NONE"
--     WRITE(*,*)"   REAL(KIND=",j,") :: a"
--     WRITE(*,*)"   INTEGER :: a_size"
--     WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2"
--     WRITE(*,*)"   a_size = SIZEOF(a)"
--     WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
--     WRITE(*,*)'   WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_"'//"//ADJUSTL(ichr2)"
--     WRITE(*,*)"   RETURN"
--     WRITE(*,*)"END SUBROUTINE"
-+     IF(j .NE. 16) THEN
-+! Disable the kind 16 check
-+! See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619281
-+        WRITE(*, "("" SUBROUTINE r"", i2.2,""()"")") j
-+        WRITE(*,*)"   IMPLICIT NONE"
-+        WRITE(*,*)"   REAL(KIND=",j,") :: a"
-+        WRITE(*,*)"   INTEGER :: a_size"
-+        WRITE(*,*)"   CHARACTER(LEN=2) :: ichr2"
-+        WRITE(*,*)"   a_size = SIZEOF(a)"
-+        WRITE(*,*)"   WRITE(ichr2,'(I2)') a_size"
-+        WRITE(*,*)'   WRITE(*,*) "#define H5_FORTRAN_HAS_REAL_"'//"//ADJUSTL(ichr2)"
-+        WRITE(*,*)"   RETURN"
-+        WRITE(*,*)"END SUBROUTINE"
-+     ENDIF
-   ENDDO
- END PROGRAM test_kind
- 
diff --git a/debian/patches/series b/debian/patches/series
index e6295cb..c363e5c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 mpi.diff
-sscanf.diff
-disabler16check.diff
 path_max.diff
diff --git a/debian/patches/sscanf.diff b/debian/patches/sscanf.diff
deleted file mode 100644
index 1d00a76..0000000
--- a/debian/patches/sscanf.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur hdf5-1.8.4-patch1.orig/src/H5Epublic.h hdf5-1.8.4-patch1/src/H5Epublic.h
---- hdf5-1.8.4-patch1.orig/src/H5Epublic.h	2010-02-22 22:31:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/src/H5Epublic.h	2010-10-08 20:23:55.000000000 +0200
-@@ -18,7 +18,7 @@
-  */
- #ifndef _H5Epublic_H
- #define _H5Epublic_H
--
-+#define _GNU_SOURCE
- #include <stdio.h>              /*FILE arg of H5Eprint()                     */
- 
- /* Public headers needed by this file */
-diff -ur hdf5-1.8.4-patch1.orig/src/H5private.h hdf5-1.8.4-patch1/src/H5private.h
---- hdf5-1.8.4-patch1.orig/src/H5private.h	2010-02-22 22:31:54.000000000 +0100
-+++ hdf5-1.8.4-patch1/src/H5private.h	2010-10-08 20:24:16.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- #ifndef _H5private_H
- #define _H5private_H
-+#define _GNU_SOURCE
- 
- #include "H5public.h"		/* Include Public Definitions		*/
- 

-- 
Hierarchical Data Format 5 (HDF5)