The following commit has been merged in the master branch:
commit a5df9f794cb96991748ede94f06d004e6fb7318c
Author: Sylvestre Ledru <sylvestre.le...@scilab-enterprises.com>
Date: Fri Jun 21 13:50:15 2013 +0200
* 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.
(Closes: #708455)
* Upload to unstable
* Standards-Version updated to 3.9.4
diff --git a/debian/changelog b/debian/changelog
index cf1f32d..579f339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+hdf5 (1.8.10-patch1-1) unstable; urgency=low
+
+ [ Helmut Grohne ]
+ * 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.
+ (Closes: #708455)
+
+ [ Sylvestre Ledru ]
+ * Upload to unstable
+ * Standards-Version updated to 3.9.4
+
+ -- Sylvestre Ledru <sylves...@debian.org> Wed, 15 May 2013 22:57:42 +0200
+
hdf5 (1.8.10-patch1-1~exp3) experimental; urgency=low
* Fix the FTBFS on powerpc, powerpcspe, and ppc64
diff --git a/debian/control b/debian/control
index e4d0678..2bb8f2f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
Sylvestre Ledru <sylves...@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 @@ Package: libhdf5-7
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 @@ Section: libs
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 @@ Section: libs
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
@@ -180,7 +186,7 @@ Section: libdevel
Priority: extra
Architecture: any
Depends: ${hdf5-mpi-dev}, mpi-default-dev, ${misc:Depends}
-Description: Hierarchical Data Format 5 (HDF5) - development files - default
version
+Description: Hierarchical Data Format 5 (HDF5) - development files - MPICH2
version
HDF5 is a file format and library for storing scientific data.
HDF5 was designed and implemented to address the deficiencies of
HDF4.x. It has a more powerful and flexible data model, supports
diff --git a/debian/control.in b/debian/control.in
index 870762d..7af833b 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -5,7 +5,7 @@ Maintainer: Debian GIS Project
<pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <fran...@debian.org>,
Sylvestre Ledru <sylves...@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 @@ Package: libhdf5-@SONAME@
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Conflicts: libhdf5-@SONAME@, libhdf5-@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-@SONAME@, libhdf5-@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 @@ Section: libs
Priority: extra
Architecture: @ARCHS@
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Conflicts: libhdf5-@SONAME@, libhdf5-@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-@SONAME@, libhdf5-@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 @@ Section: libs
Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Conflicts: libhdf5-@SONAME@, libhdf5-@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-@SONAME@, libhdf5-@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 --git a/debian/install_devlib b/debian/install_devlib
index ad156fa..740ad8f 100644
--- a/debian/install_devlib
+++ b/debian/install_devlib
@@ -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 --git a/debian/install_shlib b/debian/install_shlib
index c6bf8b2..b21c2f2 100644
--- a/debian/install_shlib
+++ b/debian/install_shlib
@@ -1 +1 @@
-usr/lib/libhdf5*.so.*
+usr/lib/*/libhdf5*.so.*
diff --git a/debian/rules b/debian/rules
index bfb6f18..b55efea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,7 @@ virtpack = $(package)-$(major_version)
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 @@ endif
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
--
Hierarchical Data Format 5 (HDF5)
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
