Package: src:fftw3
Version: 3.3.1-1
Severity: wishlist
Tags: patch

It would be useful to have a multiarched fftw3.
Attached a patch that archives that.
It sets Multiarche: same for libfftw3-3 and libfftw3-mpi
libfftw3-dev and -dbg can't be same currently as they install executables.
libfftw3-mpi-dev probably could be but I didn't want to diverge the two
-dev packages.
diff -Nru fftw3-3.3.1/debian/control fftw3-3.3.1/debian/control
--- fftw3-3.3.1/debian/control  2012-03-12 09:23:32.000000000 +0100
+++ fftw3-3.3.1/debian/control  2012-03-15 22:41:50.000000000 +0100
@@ -4,6 +4,7 @@
 Maintainer: Debian Science Team 
<[email protected]>
 Uploaders: Paul Brossier <[email protected]>
 Build-Depends: debhelper (>=7.0.0),
+               dpkg (>= 1.16.0),
                gfortran,
                texinfo, quilt, mpi-default-dev
 Build-Depends-Indep: transfig, ghostscript (>> 8.63)
@@ -15,11 +16,13 @@
 Package: libfftw3-3
 Architecture: any
 Section: libs
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libfftw3-dev
 Provides: fftw3
 Replaces: fftw3
 Conflicts: fftw3
+Multi-Arch: same
 Description: Library for computing Fast Fourier Transforms
  The FFTW library computes Fast Fourier Transforms (FFT) in one or more
  dimensions. It is extremely fast. This package contains the shared library
@@ -33,11 +36,13 @@
 Package: libfftw3-mpi-3
 Architecture: any
 Section: libs
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: libfftw3-dev
 Provides: fftw3
 Replaces: fftw3
 Conflicts: fftw3
+Multi-Arch: same
 Description: MPI Library for computing Fast Fourier Transforms
  The FFTW library computes Fast Fourier Transforms (FFT) in one or more
  dimensions. It is extremely fast. This package contains the shared library
diff -Nru fftw3-3.3.1/debian/libfftw3-3.install 
fftw3-3.3.1/debian/libfftw3-3.install
--- fftw3-3.3.1/debian/libfftw3-3.install       2012-03-12 08:46:33.000000000 
+0100
+++ fftw3-3.3.1/debian/libfftw3-3.install       2012-03-15 22:20:50.000000000 
+0100
@@ -1 +1 @@
-usr/lib/libfftw*.so.*
+usr/lib/*/libfftw*.so.*
diff -Nru fftw3-3.3.1/debian/libfftw3-dev.install 
fftw3-3.3.1/debian/libfftw3-dev.install
--- fftw3-3.3.1/debian/libfftw3-dev.install     2012-03-12 08:46:33.000000000 
+0100
+++ fftw3-3.3.1/debian/libfftw3-dev.install     2012-03-15 22:20:58.000000000 
+0100
@@ -1,5 +1,5 @@
 usr/bin/fftw*-wisdom*
 usr/include/*
-usr/lib/libfftw*.a
-usr/lib/libfftw*.so
-usr/lib/pkgconfig/fftw3*.pc
+usr/lib/*/libfftw*.a
+usr/lib/*/libfftw*.so
+usr/lib/*/pkgconfig/fftw3*.pc
diff -Nru fftw3-3.3.1/debian/libfftw3-mpi-3.install 
fftw3-3.3.1/debian/libfftw3-mpi-3.install
--- fftw3-3.3.1/debian/libfftw3-mpi-3.install   2012-03-12 08:46:33.000000000 
+0100
+++ fftw3-3.3.1/debian/libfftw3-mpi-3.install   2012-03-15 22:21:03.000000000 
+0100
@@ -1,2 +1,2 @@
-usr/lib/libfftw3*mpi.so.*
+usr/lib/*/libfftw3*mpi.so.*
 
diff -Nru fftw3-3.3.1/debian/libfftw3-mpi-dev.install 
fftw3-3.3.1/debian/libfftw3-mpi-dev.install
--- fftw3-3.3.1/debian/libfftw3-mpi-dev.install 2012-03-12 08:46:33.000000000 
+0100
+++ fftw3-3.3.1/debian/libfftw3-mpi-dev.install 2012-03-15 22:21:08.000000000 
+0100
@@ -1,3 +1,3 @@
 usr/include/*mpi*
-usr/lib/libfftw*mpi*.a
-usr/lib/libfftw*mpi*.so
+usr/lib/*/libfftw*mpi*.a
+usr/lib/*/libfftw*mpi*.so
diff -Nru fftw3-3.3.1/debian/rules fftw3-3.3.1/debian/rules
--- fftw3-3.3.1/debian/rules    2012-03-12 09:43:31.000000000 +0100
+++ fftw3-3.3.1/debian/rules    2012-03-15 22:20:28.000000000 +0100
@@ -5,6 +5,7 @@
 ARCHITECTURE := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 CFLAGS := -g -Wall
 
@@ -59,7 +60,7 @@
 SETCFLAGS := CFLAGS='$(CFLAGS)'
 
 # common configure options
-archconfflags := $(archconfflags) --prefix=/usr --enable-shared 
--enable-threads --enable-portable-binary --enable-mpi
+archconfflags := $(archconfflags) --prefix=/usr --enable-shared 
--enable-threads --enable-portable-binary --enable-mpi 
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 build-arch:
        # single precision
@@ -142,7 +143,7 @@
        if ! ./test_long_long-double; then \
                dh_install -a --sourcedir=debian/tmp-long-double; \
        fi
-       rm debian/libfftw3-3/usr/lib/libfftw3*mpi* 
debian/libfftw3-dev/usr/lib/libfftw3*mpi* debian/libfftw3-dev/usr/include/*mpi*
+       rm debian/libfftw3-3/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*mpi* 
debian/libfftw3-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*mpi* 
debian/libfftw3-dev/usr/include/*mpi*
 
 
        dh_installman -a

Attachment: signature.asc
Description: OpenPGP digital signature



Reply via email to