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

jtaylor-guest at users.alioth.debian.org jtaylor-guest at users.alioth.debian.org
Thu Mar 22 22:04:25 UTC 2012


Author: jtaylor-guest
Date: Thu Mar 22 22:04:23 2012
New Revision: 44597

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44597
Log:
Build the openmp and pthread libraries into libfft3-mt-{3,dev}

Added:
    packages/fftw3/trunk/debian/libfftw3-mt-3.install
    packages/fftw3/trunk/debian/libfftw3-mt-dev.install
Modified:
    packages/fftw3/trunk/debian/changelog
    packages/fftw3/trunk/debian/control
    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=44597&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/changelog (original)
+++ packages/fftw3/trunk/debian/changelog Thu Mar 22 22:04:23 2012
@@ -11,8 +11,9 @@
   * wrap-and-sort debian directory
   * minor package description cleanup
   * stop using removed --enable-portable-binary which is now default
-
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 22 Mar 2012 21:46:06 +0100
+  * Build the openmp and pthread libraries into libfft3-mt-{3,dev}
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 22 Mar 2012 22:58:25 +0100
 
 fftw3 (3.3.1-3) experimental; urgency=low
 

Modified: packages/fftw3/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/control?rev=44597&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/control (original)
+++ packages/fftw3/trunk/debian/control Thu Mar 22 22:04:23 2012
@@ -20,7 +20,7 @@
 Section: libs
 Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libfftw3-dev
+Suggests: libfftw3-dev, libfftw3-mt-3 (>= 3.3.1-4)
 Provides: fftw3
 Replaces: fftw3
 Conflicts: fftw3
@@ -34,6 +34,26 @@
  .
  To get the static library and the header files, you need to install
  libfftw3-dev. For documentation, see libfftw3-doc.
+
+Package: libfftw3-mt-3
+Architecture: any
+Section: libs
+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-mpi-3
 Architecture: any
@@ -64,7 +84,22 @@
  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 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
 Architecture: any
@@ -75,7 +110,8 @@
  dimensions. It is extremely fast. This package contains the statically linked
  library, header files and test programs.
  .
- For documentation, see libfftw3-doc.
+ This package contains the header files and static libraries for the
+ mpi libraries. For documentation, see libfftw3-doc.
 
 Package: libfftw3-doc
 Architecture: all

Added: packages/fftw3/trunk/debian/libfftw3-mt-3.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/libfftw3-mt-3.install?rev=44597&op=file
==============================================================================
--- packages/fftw3/trunk/debian/libfftw3-mt-3.install (added)
+++ packages/fftw3/trunk/debian/libfftw3-mt-3.install Thu Mar 22 22:04:23 2012
@@ -1,0 +1,2 @@
+usr/lib/*/libfftw*_omp.so.*
+usr/lib/*/libfftw*_threads.so.*

Added: packages/fftw3/trunk/debian/libfftw3-mt-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/libfftw3-mt-dev.install?rev=44597&op=file
==============================================================================
--- packages/fftw3/trunk/debian/libfftw3-mt-dev.install (added)
+++ packages/fftw3/trunk/debian/libfftw3-mt-dev.install Thu Mar 22 22:04:23 2012
@@ -1,0 +1,4 @@
+usr/lib/*/libfftw*_omp.a
+usr/lib/*/libfftw*_omp.so
+usr/lib/*/libfftw*_threads.a
+usr/lib/*/libfftw*_threads.so

Modified: packages/fftw3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/rules?rev=44597&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/rules (original)
+++ packages/fftw3/trunk/debian/rules Thu Mar 22 22:04:23 2012
@@ -58,7 +58,7 @@
 SETCFLAGS := CFLAGS='$(CFLAGS)'
 
 # common configure options
-archconfflags := $(archconfflags) --prefix=/usr --enable-shared --enable-threads --enable-mpi --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) MPILIBS="$(shell mpicc --showme:link)"
+archconfflags := $(archconfflags) --prefix=/usr --enable-shared --enable-threads --enable-openmp --enable-mpi --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) MPILIBS="$(shell mpicc --showme:link)"
 
 build-arch:
 	# single precision
@@ -144,6 +144,9 @@
 	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-mpi-3/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_strip --dbg-package=libfftw3-dbg -a
 	dh_compress -a -X.c -X.pl -X.am -X.in




More information about the debian-science-commits mailing list