Commit 02ed6fdc authored by Julian Taylor's avatar Julian Taylor

revert split into -mt package

  package size gain is negiglible compared to main library
parent 5b17f0f3
...@@ -3,6 +3,8 @@ fftw3 (3.3.1-5) unstable; urgency=low ...@@ -3,6 +3,8 @@ fftw3 (3.3.1-5) unstable; urgency=low
* Team upload. * Team upload.
* enable avx on i386 too * enable avx on i386 too
* move wisdom tools to libfftw3-bin, make libfftw3-dev multiarch same * move wisdom tools to libfftw3-bin, make libfftw3-dev multiarch same
* revert split into -mt package
package size gain is negiglible compared to main library
-- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 22 Apr 2012 14:30:52 +0200 -- Julian Taylor <jtaylor.debian@googlemail.com> Sun, 22 Apr 2012 14:30:52 +0200
......
...@@ -19,7 +19,7 @@ Package: libfftw3-3 ...@@ -19,7 +19,7 @@ Package: libfftw3-3
Architecture: any Architecture: any
Pre-Depends: multiarch-support Pre-Depends: multiarch-support
Depends: ${misc:Depends}, ${shlibs:Depends} Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libfftw3-dev, libfftw3-bin, libfftw3-mt3 (>= 3.3.1-4) Suggests: libfftw3-dev, libfftw3-bin
Provides: fftw3 Provides: fftw3
Replaces: fftw3 Replaces: fftw3
Conflicts: fftw3 Conflicts: fftw3
...@@ -47,25 +47,6 @@ Description: Library for computing Fast Fourier Transforms - Tools ...@@ -47,25 +47,6 @@ Description: Library for computing Fast Fourier Transforms - Tools
. .
This package contains the wisdom management tools. This package contains the wisdom management tools.
Package: libfftw3-mt3
Architecture: any
Pre-Depends: multiarch-support
Depends: ${misc:Depends}, ${shlibs:Depends}
Suggests: libfftw3-mt-dev
Breaks: libfftw3-3 (<< 3.3.1-4)
Replaces: libfftw3-3 (<< 3.3.1-4)
Multi-Arch: same
Description: Threaded 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
versions of the fftw libraries in single, double and long double precisions.
Note that on some architectures double is the same as long double in which
case there is no long double library.
.
This package contains the libraries supporting pthreads and openmp.
To get the static libraries and the header files, you need to install
libfftw3-mt-dev. For documentation, see libfftw3-doc.
Package: libfftw3-mpi3 Package: libfftw3-mpi3
Architecture: any Architecture: any
Pre-Depends: multiarch-support Pre-Depends: multiarch-support
...@@ -89,7 +70,6 @@ Architecture: any ...@@ -89,7 +70,6 @@ Architecture: any
Section: libdevel Section: libdevel
Depends: libfftw3-3 (=${binary:Version}), Depends: libfftw3-3 (=${binary:Version}),
libfftw3-bin (=${binary:Version}), libfftw3-bin (=${binary:Version}),
libfftw3-mt3 (=${binary:Version}),
${misc:Depends}, ${misc:Depends},
${shlibs:Depends} ${shlibs:Depends}
Provides: fftw3-dev Provides: fftw3-dev
...@@ -104,20 +84,6 @@ Description: Library for computing Fast Fourier Transforms - development ...@@ -104,20 +84,6 @@ Description: Library for computing Fast Fourier Transforms - development
This package contains the header files and static libraries. This package contains the header files and static libraries.
For documentation, see libfftw3-doc. For documentation, see libfftw3-doc.
Package: libfftw3-mt-dev
Architecture: any
Section: libdevel
Depends: libfftw3-dev (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
Breaks: libfftw3-3 (<< 3.3.1-4)
Replaces: libfftw3-3 (<< 3.3.1-4)
Description: Threaded library for computing Fast Fourier Transforms - development
The FFTW library computes Fast Fourier Transforms (FFT) in one or more
dimensions. It is extremely fast. This package contains the statically linked
library, header files and test programs.
.
This package contains the header files and static libraries for the
threaded libraries. For documentation, see libfftw3-doc.
Package: libfftw3-mpi-dev Package: libfftw3-mpi-dev
Architecture: any Architecture: any
Section: libdevel Section: libdevel
......
usr/lib/*/libfftw*_omp.a
usr/lib/*/libfftw*_omp.so
usr/lib/*/libfftw*_threads.a
usr/lib/*/libfftw*_threads.so
usr/lib/*/libfftw*_omp.so.*
usr/lib/*/libfftw*_threads.so.*
...@@ -140,9 +140,6 @@ binary-arch: build-arch ...@@ -140,9 +140,6 @@ binary-arch: build-arch
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* 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*
chrpath --delete debian/libfftw3-mpi3/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*mpi*so* chrpath --delete debian/libfftw3-mpi3/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*mpi*so*
rm debian/libfftw3-3/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*threads* debian/libfftw3-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*threads*
rm debian/libfftw3-3/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*omp* debian/libfftw3-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libfftw3*omp*
dh_installman -a dh_installman -a
dh_strip --dbg-package=libfftw3-dbg -a dh_strip --dbg-package=libfftw3-dbg -a
dh_compress -a -X.c -X.pl -X.am -X.in dh_compress -a -X.c -X.pl -X.am -X.in
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment