X-Git-Url: http://git.kpe.io/?p=ctsim.git;a=blobdiff_plain;f=debian%2Fcontrol;h=22f203d634034f41ef32a3c61df7500212eba3f1;hp=5a0fa927b482b1d46d1719d631ee8c48f32f312d;hb=181ac3aa636ae55b8da2a341dc380921db4fa41f;hpb=0896d690ecea2fd6538834c442c1b8a48c066694

diff --git a/debian/control b/debian/control
index 5a0fa92..22f203d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,31 +2,34 @@ 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, libwxgtk2.4-dev, ctn-dev, libpng12-0-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, libglib1.2-dev, libgtk1.2-dev 
 Build-Depends-Indep: debhelper (>= 4.0.0)
-Standards-Version: 3.5.9.0
+Standards-Version: 3.6.1.1
 
 Package: ctsim
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
-Conflicts: ctsim-pentium4, ctsim-athlon, ctsim-pentium3
-Description: Computed tomograpy simulator
+Replaces: ctsim
+Conflicts: ctsim
+Description: Computed tomography simulator
  CTSim provides an interactive computed tomography simulator. Computed
  tomography is the technique of estimating the interior of an object
- by on measuring x-ray absorption through an object.
+ by measuring x-ray absorption through that object.
  .
- It has both command-line tools and well as a graphical user interface.
- CTSim has very education trace modes for viewing the data collection
- simulation as well as the reconstruction.
+ CTSim has both command-line tools and a graphical user interface.
+ CTSim has very educational trace modes for viewing the data
+ collection simulation as well as the reconstruction.
  . 
- The home page for CTSim is http://www.ctsim.org.
+ Home page: http://www.ctsim.org/
 
 Package: ctsim-pentium4
 Architecture: i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
-Conflicts: ctsim, ctsim-athlon, ctsim-pentium3
+Provides: ctsim
+Replaces: ctsim
+Conflicts: ctsim
 Description: Computed tomograpy simulator (Pentium 4 optimized)
  CTSim provides an interactive computed tomography simulator. Computed
  tomography is the technique of estimating the interior of an object
@@ -42,9 +45,11 @@ Description: Computed tomograpy simulator (Pentium 4 optimized)
 
 Package: ctsim-athlon
 Architecture: i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3, libpng12-0
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw3, mesag3 | libgl1, libpng12-0
 Recommends: ctsim-doc
-Conflicts: ctsim, ctsim-pentium4, ctsim-pentium3
+Provides: ctsim
+Replaces: ctsim
+Conflicts: ctsim
 Description: Computed tomograpy simulator (Athlon optimized)
  CTSim provides an interactive computed tomography simulator. Computed
  tomography is the technique of estimating the interior of an object
@@ -58,24 +63,6 @@ Description: Computed tomograpy simulator (Athlon optimized)
  .
  This version of ctsim has been compiled using Athlon optimizations.
 
-Package: ctsim-pentium3
-Architecture: i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4, fftw2, mesag3, libpng12-0
-Recommends: ctsim-doc
-Conflicts: ctsim, ctsim-pentium4, ctsim-athlon
-Description: Computed tomograpy simulator (Pentium optimized)
- CTSim provides an interactive computed tomography simulator. Computed
- tomography is the technique of estimating the interior of an object
- by on measuring x-ray absorption through an object.
- .
- It has both command-line tools and well as a graphical user interface.
- CTSim has very education trace modes for viewing the data collection
- simulation as well as the reconstruction.
- . 
- The home page for CTSim is http://www.ctsim.org.
- .
- This version of ctsim has been compiled using Pentium 3 optimizations.
-
 Package: ctsim-help
 Architecture: all
 Recommends: ctsim