Bug#708455: libhdf5-7: enable multi-arch for library packages such as libhdf5-7

Helmut Grohne helmut at subdivi.de
Wed May 15 20:07:26 UTC 2013 

Package: libhdf5-7
Version: 1.8.10-patch1-1~exp3
Severity: normal
Tags: patch

Dear maintainer,

In my counting libhdf5-7 has 39 reverse dependencies that would profit
from it being multi-arch capable. So please do that. Your package made
it very easy to come up with a patch. Thanks!

You can find the general multiarch conversion documentation at:
http://wiki.debian.org/Multiarch/Implementation

If you need help or have any questions, don't hesitate to ask.

Helmut
-------------- next part --------------
diff -Nru hdf5-1.8.10-patch1/debian/changelog hdf5-1.8.10-patch1/debian/changelog
--- hdf5-1.8.10-patch1/debian/changelog	2013-04-11 17:51:25.000000000 +0200
+++ hdf5-1.8.10-patch1/debian/changelog	2013-05-15 16:44:01.000000000 +0200
@@ -1,3 +1,14 @@
+hdf5 (1.8.10-patch1-1~exp3.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Enable Multi-Arch:
+    + Bump debhelper dependency to 8.1.3.
+    + Add Multi-Arch:same markers and ${misc:Pre-Depends} to libraries.
+    + Override --libdir for configure.
+    + Updated .install files accordingly.
+
+ -- Helmut Grohne <helmut at subdivi.de>  Wed, 15 May 2013 16:36:44 +0200
+
 hdf5 (1.8.10-patch1-1~exp3) experimental; urgency=low
 
   * Fix the FTBFS on powerpc, powerpcspe, and ppc64
diff -Nru hdf5-1.8.10-patch1/debian/control hdf5-1.8.10-patch1/debian/control
--- hdf5-1.8.10-patch1/debian/control	2013-04-11 17:52:38.000000000 +0200
+++ hdf5-1.8.10-patch1/debian/control	2013-05-15 19:02:12.000000000 +0200
@@ -5,7 +5,7 @@
 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 [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
+ libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev
 Standards-Version: 3.9.3
@@ -17,11 +17,13 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libhdf5-7, libhdf5-1.8,
  libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6,
  libhdf5-1.8.7, libhdf5-serial-1.8.7
 Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -78,12 +80,14 @@
 Priority: extra
 Architecture: alpha armel armhf amd64 i386 ia64 powerpc powerpcspe ppc64 sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libhdf5-7, libhdf5-1.8,
  libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
  libhdf5-1.8.7, libhdf5-openmpi-1.8.7
 Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
  libhdf5-1.8.7, libhdf5-openmpi-1.8.7
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -128,12 +132,14 @@
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libhdf5-7, libhdf5-1.8, 
  libhdf5-1.8.4,  libhdf5-mpich2-1.8.4, libhdf5-1.8.6,  libhdf5-mpich2-1.8.6,
  libhdf5-1.8.7, libhdf5-mpich2-1.8.7
 Provides: libhdf5-7, libhdf5-1.8
 Replaces: libhdf5-1.8.4, libhdf5-mpich2-1.8.4, libhdf5-1.8.6, libhdf5-mpich2-1.8.6,
  libhdf5-1.8.7, libhdf5-mpich2-1.8.7
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
diff -Nru hdf5-1.8.10-patch1/debian/control.in hdf5-1.8.10-patch1/debian/control.in
--- hdf5-1.8.10-patch1/debian/control.in	2013-04-11 17:51:25.000000000 +0200
+++ hdf5-1.8.10-patch1/debian/control.in	2013-05-15 19:02:04.000000000 +0200
@@ -5,7 +5,7 @@
 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 [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>> 7), sed (>=4.1.5), 
+ libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 8.1.3), sed (>=4.1.5), 
  gfortran, libibverbs-dev [!arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
  sharutils, mpi-default-dev
 Standards-Version: 3.9.3
@@ -17,11 +17,13 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libhdf5- at SONAME@, libhdf5- at MAJOR_VERSION@,
  libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6,
  libhdf5-1.8.7, libhdf5-serial-1.8.7
 Provides: libhdf5- at SONAME@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.4, libhdf5-serial-1.8.4, libhdf5-1.8.6, libhdf5-serial-1.8.6, libhdf5-1.8.7, libhdf5-serial-1.8.7
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - serial version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -78,12 +80,14 @@
 Priority: extra
 Architecture: @ARCHS@
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libhdf5- at SONAME@, libhdf5- at MAJOR_VERSION@,
  libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
  libhdf5-1.8.7, libhdf5-openmpi-1.8.7
 Provides: libhdf5- at SONAME@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.4, libhdf5-openmpi-1.8.4, libhdf5-1.8.6, libhdf5-openmpi-1.8.6,
  libhdf5-1.8.7, libhdf5-openmpi-1.8.7
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - OpenMPI version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
@@ -128,12 +132,14 @@
 Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Conflicts: libhdf5- at SONAME@, libhdf5- at MAJOR_VERSION@, 
  libhdf5-1.8.4,  libhdf5-mpich2-1.8.4, libhdf5-1.8.6,  libhdf5-mpich2-1.8.6,
  libhdf5-1.8.7, libhdf5-mpich2-1.8.7
 Provides: libhdf5- at SONAME@, libhdf5- at MAJOR_VERSION@
 Replaces: libhdf5-1.8.4, libhdf5-mpich2-1.8.4, libhdf5-1.8.6, libhdf5-mpich2-1.8.6,
  libhdf5-1.8.7, libhdf5-mpich2-1.8.7
+Multi-Arch: same
 Description: Hierarchical Data Format 5 (HDF5) - runtime files - MPICH2 version
  HDF5 is a file format and library for storing scientific data. 
  HDF5 was designed and implemented to address the deficiencies of
diff -Nru hdf5-1.8.10-patch1/debian/install_devlib hdf5-1.8.10-patch1/debian/install_devlib
--- hdf5-1.8.10-patch1/debian/install_devlib	2013-04-11 17:51:25.000000000 +0200
+++ hdf5-1.8.10-patch1/debian/install_devlib	2013-05-15 16:43:19.000000000 +0200
@@ -1,4 +1,4 @@
 usr/include
-usr/lib/libhdf5*.so
-usr/lib/libhdf5*.settings
-usr/lib/libhdf5*.a
+usr/lib/*/libhdf5*.so
+usr/lib/*/libhdf5*.settings
+usr/lib/*/libhdf5*.a
diff -Nru hdf5-1.8.10-patch1/debian/install_shlib hdf5-1.8.10-patch1/debian/install_shlib
--- hdf5-1.8.10-patch1/debian/install_shlib	2013-04-11 17:51:25.000000000 +0200
+++ hdf5-1.8.10-patch1/debian/install_shlib	2013-05-15 16:43:24.000000000 +0200
@@ -1 +1 @@
-usr/lib/libhdf5*.so.*
+usr/lib/*/libhdf5*.so.*
diff -Nru hdf5-1.8.10-patch1/debian/rules hdf5-1.8.10-patch1/debian/rules
--- hdf5-1.8.10-patch1/debian/rules	2013-04-11 17:51:25.000000000 +0200
+++ hdf5-1.8.10-patch1/debian/rules	2013-05-15 16:42:14.000000000 +0200
@@ -24,6 +24,7 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
 
 DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//")
 
@@ -90,6 +91,7 @@
 CONFIGURE_FLAGS = --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
 		  --build=$(DEB_BUILD_GNU_TYPE) \
 		  --mandir=\$${prefix}/share/man \
+		  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		  --with-pthread --enable-linux-lfs --enable-unsupported \
 		  --enable-shared --enable-production=$(USE_PROD) \
 		  --disable-sharedlib-rpath --with-zlib --with-default-api-version=v18

More information about the Pkg-grass-devel mailing list