r7940: Initial working version of fftw3 conversion -- tested only with pjrec

diff --git a/ChangeLog b/ChangeLog
index f88a16ab089a933ae598ab7451b7ad3502a1977d..a8d2ba43c3213dbdd0f671f6824b465a46b13abe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Oct 5, 2003  Version 4.2.7
+Oct 5, 2003  Version 4.3.0
+
+       * Ported to incompatible FFTW3 library. CTSim will no longer compile or run with FFTW2. 
+       
+Oct 3, 2003  Version 4.2.7
 
        * Add support for building on RedHat AMD64 
 

diff --git a/debian/control b/debian/control
index 521b0ef698659d1640ad281b90fb4aa341e830c1..341137063b2e8bd055e734a4da770e48f0cf801b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,13 @@ Source: ctsim
 Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>= 4.0.0), wxwin2.4-headers, fftw-dev, libreadline4-dev, mesa-common-dev | xlibmesa-gl-dev, libglu1-mesa-dev | xlibmesa-glu-dev, libwxgtk2.4-dev, ctn-dev, libpng12-dev, dpkg-dev
+Build-Depends: debhelper (>= 4.0.0), wxwin2.4-headers, fftw3-dev, libreadline4-dev, mesa-common-dev | xlibmesa-gl-dev, libglu1-mesa-dev | xlibmesa-glu-dev, libwxgtk2.4-dev, ctn-dev, libpng12-dev, dpkg-dev
 Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.6.1.0
 
 Package: ctsim
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3 | libgl1, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
 Replaces: ctsim
 Conflicts: ctsim
@@ -25,7 +25,7 @@ Description: Computed tomograpy simulator
 
 Package: ctsim-pentium4
 Architecture: i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3 | libgl1, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
 Provides: ctsim
 Replaces: ctsim
@@ -45,7 +45,7 @@ Description: Computed tomograpy simulator (Pentium 4 optimized)
 
 Package: ctsim-athlon
 Architecture: i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3 | libgl1, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
 Provides: ctsim
 Replaces: ctsim
@@ -65,7 +65,7 @@ Description: Computed tomograpy simulator (Athlon optimized)
 
 Package: ctsim-pentium3
 Architecture: i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3 | libgl1, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
 Provides: ctsim
 Replaces: ctsim

diff --git a/doc/ctsim-install.tex b/doc/ctsim-install.tex
index 083d293bcc621657bf65f39640ec887271bdbd3b..caed69e132fe3bb28657ff33c369e8e366759e18 100644 (file)
--- a/doc/ctsim-install.tex
+++ b/doc/ctsim-install.tex
@@ -45,7 +45,7 @@ However, they add functionality to \ctsim\ and there inclusion is recommended.
   of \ctsim\ requires this library.\\
   \urlref{Web site}{http://www.wxwindows.org}
 
-  \item \textbf{FFTW}\\
+  \item \textbf{FFTW3}\\
     Used for fast Fourier transformations of projections and images.
     Without this library \ctsim\ will use slower, traditional Fourier transformations.\\
     \urlref{Web site}{http://www.fftw.org}