From ff0f60e1254a26de7c3f8153a53df78ce9909483 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Thu, 24 Jun 2004 15:01:31 +0000 Subject: [PATCH] r9686: remove old p3 package --- debian/control | 22 +--------------------- debian/ctsim-athlon.menu | 2 +- debian/ctsim-pentium4.menu | 2 +- debian/ctsim.menu | 2 +- debian/rules | 10 +--------- 5 files changed, 5 insertions(+), 33 deletions(-) diff --git a/debian/control b/debian/control index 599aa17..02c0971 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: ctsim Section: science Priority: extra Maintainer: Kevin M. Rosenberg -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 @@ -63,26 +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, 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 diff --git a/debian/ctsim-athlon.menu b/debian/ctsim-athlon.menu index 8d73c32..292c491 100644 --- a/debian/ctsim-athlon.menu +++ b/debian/ctsim-athlon.menu @@ -1,4 +1,4 @@ ?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" diff --git a/debian/ctsim-pentium4.menu b/debian/ctsim-pentium4.menu index 66ee5da..e8b05d4 100644 --- a/debian/ctsim-pentium4.menu +++ b/debian/ctsim-pentium4.menu @@ -1,4 +1,4 @@ ?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" diff --git a/debian/ctsim.menu b/debian/ctsim.menu index 416ad06..47dbeb7 100644 --- a/debian/ctsim.menu +++ b/debian/ctsim.menu @@ -1,4 +1,4 @@ ?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" diff --git a/debian/rules b/debian/rules index 4d073ab..7bfcfea 100755 --- 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-p3 := ctsim-pentium3 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-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) -DESTDIR-P3 := `pwd`/$(prefix-p3) 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 @@ -84,11 +81,6 @@ install: build 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 -- 2.34.1