r9686: remove old p3 package

diff --git a/debian/control b/debian/control
index 599aa17527ba0bec0ad1f74007e6ab793edae42e..02c097132b670d5b4ad2198bf21f24bc3d721375 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ctsim
 Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
 Section: science
 Priority: extra
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>

-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: 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

 Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.6.1.0
 
 Build-Depends-Indep: debhelper (>= 4.0.0)
 Standards-Version: 3.6.1.0
 


@@ -63,26 +63,6 @@ Description: Computed tomograpy simulator (Athlon optimized)
  .
  This version of ctsim has been compiled using Athlon optimizations.
 
  .
  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, fftw3, mesag3 | libgl1, libpng12-0
-Recommends: ctsim-doc
-Provides: ctsim
-Replaces: ctsim
-Conflicts: ctsim
-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
 Package: ctsim-help
 Architecture: all
 Recommends: ctsim

diff --git a/debian/ctsim-athlon.menu b/debian/ctsim-athlon.menu
index 8d73c3238e491a3664fbbc83397465ae723bcedc..292c4911aac209c2e078d3d7b9b22d5db563b739 100644 (file)
--- a/debian/ctsim-athlon.menu
+++ b/debian/ctsim-athlon.menu
@@ -1,4 +1,4 @@
 ?package(ctsim-athlon):needs="X11" section="Apps/Math"\
 ?package(ctsim-athlon):needs="X11" section="Apps/Math"\

-    title="CtSim" icon="/usr/X11R6/include/X11/pixmaps/ctsim.xpm"\
+    title="CTSim" icon="/usr/share/pixmaps/ctsim.xpm"\

     command="/usr/bin/ctsim"\
     hints="Computed Tomograpy Simulator"
     command="/usr/bin/ctsim"\
     hints="Computed Tomograpy Simulator"

diff --git a/debian/ctsim-pentium4.menu b/debian/ctsim-pentium4.menu
index 66ee5da6f3157f14f343656a34ff8a77d7dcac88..e8b05d4154aea082f2b7debd945a94f0a86319bc 100644 (file)
--- a/debian/ctsim-pentium4.menu
+++ b/debian/ctsim-pentium4.menu
@@ -1,4 +1,4 @@
 ?package(ctsim-pentium4):needs="X11" section="Apps/Math"\
 ?package(ctsim-pentium4):needs="X11" section="Apps/Math"\

-    title="CtSim" icon="/usr/X11R6/include/X11/pixmaps/ctsim.xpm"\
+    title="CTSim" icon="/usr/share/pixmaps/ctsim.xpm"\

     command="/usr/bin/ctsim"\
     hints="Computed Tomograpy Simulator"
     command="/usr/bin/ctsim"\
     hints="Computed Tomograpy Simulator"

diff --git a/debian/ctsim.menu b/debian/ctsim.menu
index 416ad0646f4acfcdd380bf05dae83340ce32a933..47dbeb783784a011bcca1c05c34fb290ce9b2661 100644 (file)
--- a/debian/ctsim.menu
+++ b/debian/ctsim.menu
@@ -1,4 +1,4 @@
 ?package(ctsim):needs="X11" section="Apps/Math"\
 ?package(ctsim):needs="X11" section="Apps/Math"\

-    title="CtSim" icon="/usr/X11R6/include/X11/pixmaps/ctsim.xpm"\
+    title="CTSim" icon="/usr/share/pixmaps/ctsim.xpm"\

     command="/usr/bin/ctsim"\
     hints="Computed Tomograpy Simulator"
     command="/usr/bin/ctsim"\
     hints="Computed Tomograpy Simulator"

diff --git a/debian/rules b/debian/rules
index 4d073ab967808f5de8dd44cacb7d4e9f3d3f7673..7bfcfea8f151a08280d7e0d83ca4bbbd7062822d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,6 @@ host_arch     := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pkg            := ctsim
 pkg-p4         := ctsim-pentium4
 
 pkg            := ctsim
 pkg-p4         := ctsim-pentium4

-pkg-p3         := ctsim-pentium3

 pkg-athlon     := ctsim-athlon
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc
 pkg-athlon     := ctsim-athlon
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc


@@ -20,18 +19,16 @@ ctsim-shared        := usr/share/ctsim
 
 prefix         := debian/$(pkg)
 prefix-p4      := debian/$(pkg-p4)
 
 prefix         := debian/$(pkg)
 prefix-p4      := debian/$(pkg-p4)

-prefix-p3      := debian/$(pkg-p3)

 prefix-athlon  := debian/$(pkg-athlon)
 prefix-help    := debian/$(pkg-help)
 prefix-doc     := debian/$(pkg-doc)
 
 DESTDIR                := `pwd`/$(prefix)
 DESTDIR-P4     := `pwd`/$(prefix-p4)
 prefix-athlon  := debian/$(pkg-athlon)
 prefix-help    := debian/$(pkg-help)
 prefix-doc     := debian/$(pkg-doc)
 
 DESTDIR                := `pwd`/$(prefix)
 DESTDIR-P4     := `pwd`/$(prefix-p4)

-DESTDIR-P3     := `pwd`/$(prefix-p3)

 DESTDIR-ATHLON := `pwd`/$(prefix-athlon)
 HELPDIR                := `pwd`/$(prefix-help)/$(ctsim-shared)
 doc-dir                := usr/share/doc/$(pkg-doc)
 DESTDIR-ATHLON := `pwd`/$(prefix-athlon)
 HELPDIR                := `pwd`/$(prefix-help)/$(ctsim-shared)
 doc-dir                := usr/share/doc/$(pkg-doc)

-pixmap-dir     := usr/X11R6/include/X11/pixmaps
+pixmap-dir     := usr/share/pixmaps

 
 
 configure: configure-stamp
 
 
 configure: configure-stamp


@@ -84,11 +81,6 @@ install: build
        echo Host architecture is $(host_arch)
 ifneq (,$(findstring i386,$(host_arch)))
        # Building CPU-specific i386 flavors
        echo Host architecture is $(host_arch)
 ifneq (,$(findstring i386,$(host_arch)))
        # Building CPU-specific i386 flavors

-       # Pentium 3
-       ${MAKE} clean
-       ./configure --prefix=$(DESTDIR-P3)/usr --mandir=$(DESTDIR-P3)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium3
-       $(MAKE) all
-       ${MAKE} install

        # Pentium 4
        ${MAKE} clean
        ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium4
        # Pentium 4
        ${MAKE} clean
        ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium4