[fftw] 07/16: Imported Debian patch 2.1.3-16.2

[Mattia Rizzolo]

This is an automated email from the git hooks/post-receive script.

mattia pushed a commit to branch master
in repository fftw.

commit 9ed1e826ea34762d19397b931dac6952eec556d0
Author: Steve Langasek <vorlon at debian.org>
Date:   Wed Oct 19 17:57:25 2005 -0700

    Imported Debian patch 2.1.3-16.2
---
 debian/changelog |  9 +++++++++
 debian/rules     | 18 +++++++++---------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9125f6d..02f74a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+fftw (2.1.3-16.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix the NMU so that we do local linking against libfftw/libsfftw *before*
+    moving the files out of the build tree; the previous upload only built
+    because I somehow had fftw-dev already installed. :/  Closes: #334726.
+
+ -- Steve Langasek <vorlon at debian.org>  Wed, 19 Oct 2005 17:57:25 -0700
+
 fftw (2.1.3-16.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/rules b/debian/rules
index ac1fe6d..527e5f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,15 +32,15 @@ else
 	./configure --prefix=/usr --enable-shared --enable-mpi --enable-threads
 endif
 	$(MAKE) LIBS=-lm
-	mv fftw/.libs/libfftw.so.$(lib_version) rfftw/.libs/librfftw.so.$(lib_version) shared.d
-	mv threads/.libs/lib*fftw_threads.so.$(lib_version) shared.d
-	cp fftw/fftw.h rfftw/rfftw.h threads/fftw_threads.h threads/rfftw_threads.h \
-		mpi/fftw_mpi.h mpi/rfftw_mpi.h shared.d
 	# don't use mpicc to create the shared lib or the mpich static lib will be included
 	cd mpi && gcc -shared -Wl,-soname -Wl,libfftw_mpi.so.$(version_major) \
 		-o .libs/libfftw_mpi.so.$(lib_version) sched.lo \
 		TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo \
 		-L/usr/lib/mpich/lib/shared -lmpich -L../fftw/.libs -lfftw
+	mv fftw/.libs/libfftw.so.$(lib_version) rfftw/.libs/librfftw.so.$(lib_version) shared.d
+	mv threads/.libs/lib*fftw_threads.so.$(lib_version) shared.d
+	cp fftw/fftw.h rfftw/rfftw.h threads/fftw_threads.h threads/rfftw_threads.h \
+		mpi/fftw_mpi.h mpi/rfftw_mpi.h shared.d
 	mv mpi/.libs/libfftw_mpi.so.$(lib_version) mpi/.libs/librfftw_mpi.so.$(lib_version) shared.d
 	$(MAKE) clean
 	#
@@ -51,15 +51,15 @@ else
 	./configure --enable-float --enable-type-prefix --prefix=/usr --enable-shared --enable-mpi --enable-threads
 endif
 	$(MAKE) LIBS=-lm
-	mv fftw/.libs/libsfftw.so.$(lib_version) rfftw/.libs/libsrfftw.so.$(lib_version) shared.s
-	mv threads/.libs/lib*fftw_threads.so.$(lib_version) shared.s
-	cp fftw/sfftw.h rfftw/srfftw.h threads/s*fftw_threads.h \
-		mpi/sfftw_mpi.h mpi/srfftw_mpi.h shared.s
 	# don't use mpicc to create the shared lib or the mpich static lib will be included
 	cd mpi && gcc -shared -Wl,-soname -Wl,libsfftw_mpi.so.$(version_major) \
 		-o .libs/libsfftw_mpi.so.$(lib_version) sched.lo \
 		TOMS_transpose.lo transpose_mpi.lo fftwnd_mpi.lo fftw_mpi.lo \
-		-L/usr/lib/mpich/lib/shared -lmpich -L../fftw/.libs -lfftw
+		-L/usr/lib/mpich/lib/shared -lmpich -L../fftw/.libs -lsfftw
+	mv fftw/.libs/libsfftw.so.$(lib_version) rfftw/.libs/libsrfftw.so.$(lib_version) shared.s
+	mv threads/.libs/lib*fftw_threads.so.$(lib_version) shared.s
+	cp fftw/sfftw.h rfftw/srfftw.h threads/s*fftw_threads.h \
+		mpi/sfftw_mpi.h mpi/srfftw_mpi.h shared.s
 	mv mpi/.libs/libsfftw_mpi.so.$(lib_version) mpi/.libs/libsrfftw_mpi.so.$(lib_version) shared.s
 	$(MAKE) clean
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fftw.git