r44601 - in /packages/fftw3/trunk/debian: changelog control libfftw3-mpi-3.install libfftw3-mpi3.install libfftw3-mt-3.install libfftw3-mt3.install rules

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

Author: jtaylor-guest
Date: Thu Mar 22 23:28:33 2012
New Revision: 44601

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44601
Log:
rename libfftw3-mpi-3 to libfftw3-mpi3 to conform to naming rules

Added:
    packages/fftw3/trunk/debian/libfftw3-mpi3.install
      - copied unchanged from r44594, packages/fftw3/trunk/debian/libfftw3-mpi-3.install
    packages/fftw3/trunk/debian/libfftw3-mt3.install
      - copied unchanged from r44597, packages/fftw3/trunk/debian/libfftw3-mt-3.install
Removed:
    packages/fftw3/trunk/debian/libfftw3-mpi-3.install
    packages/fftw3/trunk/debian/libfftw3-mt-3.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=44601&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/changelog (original)
+++ packages/fftw3/trunk/debian/changelog Thu Mar 22 23:28:33 2012
@@ -12,9 +12,10 @@
   * wrap-and-sort debian directory
   * minor package description cleanup
   * stop using removed --enable-portable-binary which is now default
-  * Build the openmp and pthread libraries into libfftw3-mt-{3,dev}
-
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Thu, 22 Mar 2012 23:07:17 +0100
+  * Build the openmp and pthread libraries into libfftw3-mt{3,dev}
+  * rename libfftw3-mpi-3 to libfftw3-mpi3 to conform to naming rules
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Fri, 23 Mar 2012 00:26:17 +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=44601&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/control (original)
+++ packages/fftw3/trunk/debian/control Thu Mar 22 23:28:33 2012
@@ -19,7 +19,7 @@
 Architecture: any
 Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: libfftw3-dev, libfftw3-mt-3 (>= 3.3.1-4)
+Suggests: libfftw3-dev, libfftw3-mt3 (>= 3.3.1-4)
 Provides: fftw3
 Replaces: fftw3
 Conflicts: fftw3
@@ -34,7 +34,7 @@
  To get the static library and the header files, you need to install
  libfftw3-dev. For documentation, see libfftw3-doc.
 
-Package: libfftw3-mt-3
+Package: libfftw3-mt3
 Architecture: any
 Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -53,11 +53,13 @@
  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
+Package: libfftw3-mpi3
 Architecture: any
 Pre-Depends: multiarch-support
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Suggests: libfftw3-mpi-dev
+Breaks: libfftw3-mpi-3
+Replaces: libfftw3-mpi-3
 Multi-Arch: same
 Description: MPI Library for computing Fast Fourier Transforms
  The FFTW library computes Fast Fourier Transforms (FFT) in one or more
@@ -101,7 +103,7 @@
 Package: libfftw3-mpi-dev
 Architecture: any
 Section: libdevel
-Depends: libfftw3-mpi-3 (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: libfftw3-mpi3 (=${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
 Description: MPI 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

Modified: packages/fftw3/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fftw3/trunk/debian/rules?rev=44601&op=diff
==============================================================================
--- packages/fftw3/trunk/debian/rules (original)
+++ packages/fftw3/trunk/debian/rules Thu Mar 22 23:28:33 2012
@@ -138,7 +138,7 @@
 		dh_install -a --sourcedir=debian/tmp-long-double; \
 	fi
 	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*
+	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*