[SCM] hdf5 branch, master, updated. upstream/1.8.12-114-g02acab6

Gilles Filippini pini at debian.org
Sun Dec 8 21:43:34 UTC 2013


The following commit has been merged in the master branch:
commit 6b304d53ec6c41e44bc822d2c412ec29ec398660
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Dec 8 21:15:05 2013 +0100

    "Multi-Arch: same" for debug packages.
    
    Fix lintian warning debug-package-for-multi-arch-same-pkg-not-coinstallable.

diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 2d6e04f..3e56cff 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
- libopenmpi-dev [!arm64 !hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
+ libopenmpi-dev [!arm64 !hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev, chrpath, autotools-dev
 Standards-Version: 3.9.4
@@ -39,6 +39,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-7 (= ${binary:Version})
 Conflicts: libhdf5-mpich2-7-dbg, libhdf5-openmpi-7-dbg
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -121,6 +122,7 @@ Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc k
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-openmpi-7 (= ${binary:Version}),
 Conflicts: libhdf5-7-dbg, libhdf5-mpich2-7-dbg
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -176,6 +178,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-mpich2-7 (= ${binary:Version}),
 Conflicts: libhdf5-openmpi-7-dbg, libhdf5-7-dbg
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Mpich2 Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
diff --git a/debian/control.in b/debian/control.in
index c9504f9..2c80b34 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
  Sylvestre Ledru <sylvestre at debian.org>
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich2-dev, zlib1g-dev,
- libopenmpi-dev [!arm64 !hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5),
+ libopenmpi-dev [!arm64 !hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev, chrpath, autotools-dev
 Standards-Version: 3.9.4
@@ -39,6 +39,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5- at SONAME@ (= ${binary:Version})
 Conflicts: libhdf5-mpich2- at SONAME@-dbg, libhdf5-openmpi- at SONAME@-dbg
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -121,6 +122,7 @@ Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-openmpi- at SONAME@ (= ${binary:Version}),
 Conflicts: libhdf5- at SONAME@-dbg, libhdf5-mpich2- at SONAME@-dbg
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - OpenMPI Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of
@@ -176,6 +178,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libhdf5-mpich2- at SONAME@ (= ${binary:Version}),
 Conflicts: libhdf5-openmpi- at SONAME@-dbg, libhdf5- at SONAME@-dbg
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - Mpich2 Debug package
  HDF5 is a file format and library for storing scientific data.
  HDF5 was designed and implemented to address the deficiencies of

-- 
Hierarchical Data Format 5 (HDF5)



More information about the Pkg-grass-devel mailing list