r44572 - in /packages/fftw3/trunk/debian: changelog control libfftw3-3.install libfftw3-dev.install libfftw3-mpi-3.install libfftw3-mpi-dev.install rules

sylvestre at users.alioth.debian.org sylvestre at users.alioth.debian.org
Thu Mar 15 23:39:36 UTC 2012 

Author: sylvestre
Date: Thu Mar 15 23:39:35 2012
New Revision: 44572

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44572
Log:
* Add the multiarch support. Thanks to Julian Taylor for the patch
  (Closes: #664155)
* Fix some various silly and useless conflicts (Closes: #664156)

Modified:
    packages/fftw3/trunk/debian/changelog
    packages/fftw3/trunk/debian/control
    packages/fftw3/trunk/debian/libfftw3-3.install
    packages/fftw3/trunk/debian/libfftw3-dev.install
    packages/fftw3/trunk/debian/libfftw3-mpi-3.install
    packages/fftw3/trunk/debian/libfftw3-mpi-dev.install
    packages/fftw3/trunk/debian/rules

Modified: packages/fftw3/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/changelog?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/changelog (original)
+++ packages/fftw3/trunk/debian/changelog Thu Mar 15 23:39:35 2012
@@ -1,3 +1,11 @@
+fftw3 (3.3.1-2) experimental; urgency=low
+
+  * Add the multiarch support. Thanks to Julian Taylor for the patch
+    (Closes: #664155)
+  * Fix some various silly and useless conflicts (Closes: #664156)
+  
+ -- Sylvestre Ledru <sylvestre at debian.org>  Thu, 15 Mar 2012 23:08:45 +0100
+
 fftw3 (3.3.1-1) experimental; urgency=low
 
   * Team upload.

Modified: packages/fftw3/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/control?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/control (original)
+++ packages/fftw3/trunk/debian/control Thu Mar 15 23:39:35 2012
@@ -4,6 +4,7 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Paul Brossier <piem at debian.org>
 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,10 @@
 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
+Suggests: libfftw3-mpi-dev
+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
@@ -65,10 +67,7 @@
 Package: libfftw3-mpi-dev
 Architecture: any
 Section: libdevel
-Depends: libfftw3-3 (=${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Provides: fftw3-dev
-Replaces: fftw3-dev
-Conflicts: fftw3-dev
+Depends: ${shlibs:Depends}, ${misc:Depends}
 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 statically linked

Modified: packages/fftw3/trunk/debian/libfftw3-3.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/libfftw3-3.install?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/libfftw3-3.install (original)
+++ packages/fftw3/trunk/debian/libfftw3-3.install Thu Mar 15 23:39:35 2012
@@ -1,1 +1,1 @@
-usr/lib/libfftw*.so.*
+usr/lib/*/libfftw*.so.*

Modified: packages/fftw3/trunk/debian/libfftw3-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/libfftw3-dev.install?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/libfftw3-dev.install (original)
+++ packages/fftw3/trunk/debian/libfftw3-dev.install Thu Mar 15 23:39:35 2012
@@ -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

Modified: packages/fftw3/trunk/debian/libfftw3-mpi-3.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/libfftw3-mpi-3.install?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/libfftw3-mpi-3.install (original)
+++ packages/fftw3/trunk/debian/libfftw3-mpi-3.install Thu Mar 15 23:39:35 2012
@@ -1,2 +1,2 @@
-usr/lib/libfftw3*mpi.so.*
+usr/lib/*/libfftw3*mpi.so.*
 

Modified: packages/fftw3/trunk/debian/libfftw3-mpi-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/libfftw3-mpi-dev.install?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/libfftw3-mpi-dev.install (original)
+++ packages/fftw3/trunk/debian/libfftw3-mpi-dev.install Thu Mar 15 23:39:35 2012
@@ -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

Modified: packages/fftw3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/rules?rev=44572&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/rules (original)
+++ packages/fftw3/trunk/debian/rules Thu Mar 15 23:39:35 2012
@@ -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

More information about the debian-science-commits mailing list