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

[jtaylor-guest at users.alioth.debian.org]

Author: jtaylor-guest
Date: Sun Apr 22 14:23:25 2012
New Revision: 44725

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44725
Log:
revert split into -mt package
  package size gain is negiglible compared to main library

Removed:
    packages/fftw3/trunk/debian/libfftw3-mt-dev.install
    packages/fftw3/trunk/debian/libfftw3-mt3.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=44725&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/changelog (original)
+++ packages/fftw3/trunk/debian/changelog Sun Apr 22 14:23:25 2012
@@ -3,6 +3,8 @@
   * Team upload.
   * enable avx on i386 too
   * 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 at googlemail.com>  Sun, 22 Apr 2012 14:30:52 +0200
 

Modified: packages/fftw3/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/control?rev=44725&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/control (original)
+++ packages/fftw3/trunk/debian/control Sun Apr 22 14:23:25 2012
@@ -19,7 +19,7 @@
 Architecture: any
 Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libfftw3-dev, libfftw3-bin, libfftw3-mt3 (>= 3.3.1-4)
+Suggests: libfftw3-dev, libfftw3-bin
 Provides: fftw3
 Replaces: fftw3
 Conflicts: fftw3
@@ -47,25 +47,6 @@
  .
  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
 Architecture: any
 Pre-Depends: multiarch-support
@@ -89,7 +70,6 @@
 Section: libdevel
 Depends: libfftw3-3 (=${binary:Version}),
          libfftw3-bin (=${binary:Version}),
-         libfftw3-mt3 (=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Provides: fftw3-dev
@@ -103,20 +83,6 @@
  .
  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

Modified: packages/fftw3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/rules?rev=44725&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/rules (original)
+++ packages/fftw3/trunk/debian/rules Sun Apr 22 14:23:25 2012
@@ -140,9 +140,6 @@
 	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*
 
-	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