[SCM] hdf5 branch, master, updated. upstream/1.8.4-patch1-15-g58a3ab7

[Sylvestre Ledru]

The following commit has been merged in the master branch:
commit 58a3ab7cc4ea13b2e1202034bd9ca3eb394ed99a
Author: Sylvestre Ledru <sylvestre.ledru at scilab.org>
Date:   Thu Mar 3 14:30:12 2011 +0100

    Remove dependency on libjpeg62-dev

diff --git a/debian/control b/debian/control
index e57dd82..154d46b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at 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], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
+ 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
@@ -64,7 +64,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: alpha amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64
-Depends: libhdf5-openmpi-1.8.6 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi-1.8.6 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libopenmpi-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -98,7 +98,7 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2-1.8.6 (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2-1.8.6 (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
diff --git a/debian/control.in b/debian/control.in
index c7f3c80..e3b1cca 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at 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], libjpeg62-dev | libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
+ 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
@@ -64,7 +64,7 @@ Package: libhdf5-openmpi-dev
 Section: libdevel
 Priority: extra
 Architecture: @ARCHS@
-Depends: libhdf5-openmpi- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libopenmpi-dev, ${misc:Depends}
+Depends: libhdf5-openmpi- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libopenmpi-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc
@@ -98,7 +98,7 @@ Package: libhdf5-mpich2-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libhdf5-mpich2- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg62-dev, libmpich21.0-dev, ${misc:Depends}
+Depends: libhdf5-mpich2- at VERSION@ (= ${binary:Version}), zlib1g-dev, libjpeg-dev, libmpich21.0-dev, ${misc:Depends}
 Conflicts: libhdf5-dev
 Provides: libhdf5-dev
 Suggests: libhdf5-doc

-- 
Hierarchical Data Format 5 (HDF5)