The following commit has been merged in the master branch: commit e018c3d4f10ca9761301f35e72cbd6fd27d92e05 Author: Sylvestre Ledru <sylvestre.le...@scilab.org> Date: Sat May 7 22:18:53 2011 +0200
* Disable the r16 check (Closes: #619281) * Standards-Version updated to version 3.9.2 diff --git a/debian/changelog b/debian/changelog index a91f935..f5104b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ hdf5 (1.8.6-2) experimental; urgency=low - * Workaround for bug #619281 while #622783 is not fixed + * Disable the r16 check (Closes: #619281) + * Standards-Version updated to version 3.9.2 -- Sylvestre Ledru <sylves...@debian.org> Thu, 14 Apr 2011 18:31:50 +0200 diff --git a/debian/control b/debian/control index 5d92fb9..0007f0b 100644 --- a/debian/control +++ b/debian/control @@ -3,12 +3,12 @@ Section: science Priority: optional Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org>, - Sylvestre Ledru <sylves...@debian.org> + Sylvestre Ledru <sylves...@debian.org> Build-Depends: libmpich2-dev, zlib1g-dev, lam4-dev (>= 7.1.1-3.2), libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), - gfortran (>= 4.6), libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4], + gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4], sharutils, mpi-default-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://hdfgroup.org/HDF5/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git @@ -128,6 +128,7 @@ Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2 vers Package: libhdf5-doc Section: doc Architecture: all +Depends: ${misc:Depends} Suggests: libhdf5-dev, www-browser, pdf-viewer, doc-base Description: Hierarchical Data Format 5 (HDF5) - Documentation HDF5 is a file format and library for storing scientific data. diff --git a/debian/control.in b/debian/control.in index 3df0b4a..03acd4f 100644 --- a/debian/control.in +++ b/debian/control.in @@ -8,7 +8,7 @@ Build-Depends: libmpich2-dev, zlib1g-dev, lam4-dev (>= 7.1.1-3.2), libopenmpi-dev [!arm !armel !hppa !mips !mipsel !s390 !sh4 !m68k], libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), gfortran, libibverbs-dev [!arm !armel !hppa !mips !mipsel !s390 !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4], sharutils, mpi-default-dev -Standards-Version: 3.9.1 +Standards-Version: 3.9.2 Homepage: http://hdfgroup.org/HDF5/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/hdf5.git Vcs-Git: git://git.debian.org/git/pkg-grass/hdf5.git diff --git a/debian/patches/disabler16check.diff b/debian/patches/disabler16check.diff new file mode 100644 index 0000000..c789412 --- /dev/null +++ b/debian/patches/disabler16check.diff @@ -0,0 +1,48 @@ +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 95f7e47..5aa146f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,5 @@ mpi.diff sscanf.diff autotools.diff allowthreadsafe.diff +disabler16check.diff + -- Hierarchical Data Format 5 (HDF5) _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel