From ad9ef8adedc455741e81cd64663bc3f56dd2e7fe Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Fri, 31 Jan 2003 20:27:16 +0000 Subject: [PATCH] r3908: Automatic commit for debian_version_4_1_0-1 --- benchmarks/results | 1 + debian/control | 26 ++++---------------------- debian/rules | 24 +++++++++--------------- 3 files changed, 14 insertions(+), 37 deletions(-) diff --git a/benchmarks/results b/benchmarks/results index b94d747..6bf3326 100644 --- a/benchmarks/results +++ b/benchmarks/results @@ -4,6 +4,7 @@ Composite Test Pentium 4 2.8GHz: 19.6s (i386) 19.6s (Pentium) + s (Pentium 3) 14.3s (Pentium 4) 28% Athlon MP 1800+ diff --git a/debian/control b/debian/control index 3150a38..d6a622a 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Package: ctsim Architecture: any Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc -Conflicts: ctsim-pentium4, ctsim-athlon, ctsim-pentium3, ctsim-athlon-mp +Conflicts: ctsim-pentium4, ctsim-athlon, ctsim-pentium3 Description: Computed tomograpy simulator CTSim provides an interactive computed tomography simulator. Computed tomography is the technique of estimating the interior of an object @@ -25,7 +25,7 @@ Package: ctsim-pentium4 Architecture: i386 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc -Conflicts: ctsim, ctsim-athlon, ctsim-athlon-mp, ctsim-pentium3 +Conflicts: ctsim, ctsim-athlon, ctsim-pentium3 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 @@ -43,7 +43,7 @@ Package: ctsim-athlon Architecture: i386 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc -Conflicts: ctsim, ctsim-pentium4, ctsim-pentium3, ctsim-athlon-mp +Conflicts: ctsim, ctsim-pentium4, ctsim-pentium3 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 @@ -57,29 +57,11 @@ Description: Computed tomograpy simulator (Athlon optimized) . This version of ctsim has been compiled using Athlon optimizations. -Package: ctsim-athlon-mp -Architecture: i386 -Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn -Recommends: ctsim-doc -Conflicts: ctsim, ctsim-pentium4, ctsim-athlon, ctsim-pentium3 -Description: Computed tomograpy simulator (Athlon-MP 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 Athlon MP optimizations. - Package: ctsim-pentium3 Architecture: i386 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn Recommends: ctsim-doc -Conflicts: ctsim, ctsim-pentium4, ctsim-athlon, ctsim-athlon-mp +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 diff --git a/debian/rules b/debian/rules index 1a14078..e02ab07 100755 --- a/debian/rules +++ b/debian/rules @@ -15,7 +15,6 @@ pkg := ctsim pkg-p4 := ctsim-pentium4 pkg-p3 := ctsim-pentium3 pkg-athlon := ctsim-athlon -pkg-athlon-mp := ctsim-athlon-mp pkg-help := ctsim-help pkg-doc := ctsim-doc @@ -25,7 +24,6 @@ prefix := debian/$(pkg) prefix-p4 := debian/$(pkg-p4) prefix-p3 := debian/$(pkg-p3) prefix-athlon := debian/$(pkg-athlon) -prefix-athlon-mp:= debian/$(pkg-athlon-mp) prefix-help := debian/$(pkg-help) prefix-doc := debian/$(pkg-doc) @@ -33,7 +31,6 @@ DESTDIR := `pwd`/$(prefix) DESTDIR-P4 := `pwd`/$(prefix-p4) DESTDIR-P3 := `pwd`/$(prefix-p3) DESTDIR-ATHLON := `pwd`/$(prefix-athlon) -DESTDIR-ATHLON-MP := `pwd`/$(prefix-athlon-mp) HELPDIR := `pwd`/$(prefix-help)/$(ctsim-shared) doc-dir := usr/share/doc/$(pkg-doc) pixmap-dir := usr/X11R6/include/X11/pixmaps @@ -104,19 +101,12 @@ ifneq (,$(findstring i386,$(host_arch))) ./configure --prefix=$(DESTDIR-ATHLON)/usr --mandir=$(DESTDIR-ATHLON)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon $(MAKE) all ${MAKE} install - # Athlon MP - ${MAKE} clean - ./configure --prefix=$(DESTDIR-ATHLON-MP)/usr --mandir=$(DESTDIR-ATHLON-MP)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon-mp - $(MAKE) all - ${MAKE} install - dh_installdirs -p $(pkg-p) $(pixmap-dir) + dh_installdirs -p $(pkg-p3) $(pixmap-dir) dh_installdirs -p $(pkg-p4) $(pixmap-dir) dh_installdirs -p $(pkg-athlon) $(pixmap-dir) - dh_installdirs -p $(pkg-athlon-mp) $(pixmap-dir) - dh_install -p $(pkg-p) debian/ctsim.xpm $(pixmap-dir) + dh_install -p $(pkg-p3) debian/ctsim.xpm $(pixmap-dir) dh_install -p $(pkg-p4) debian/ctsim.xpm $(pixmap-dir) dh_install -p $(pkg-athlon) debian/ctsim.xpm $(pixmap-dir) - dh_install -p $(pkg-athlon-mp) debian/ctsim.xpm $(pixmap-dir) endif # Add here commands to install the package into debian/ctsim. dh_installdirs -p $(pkg) $(pixmap-dir) @@ -163,7 +153,12 @@ binary-arch: build install dh_testroot -a # dh_installdebconf -a dh_installdocs -a - dh_installexamples -a tools/sample-ctsim.sh helical/sample-helical.sh + dh_installexamples - $(pkg) tools/sample-ctsim.sh helical/sample-helical.sh +ifneq (,$(findstring i386,$(host_arch))) + dh_installexamples - $(pkg-p3) tools/sample-ctsim.sh helical/sample-helical.sh + dh_installexamples - $(pkg-p4) tools/sample-ctsim.sh helical/sample-helical.sh + dh_installexamples - $(pkg-athlon) tools/sample-ctsim.sh helical/sample-helical.sh +endif dh_installmenu -a # dh_installlogrotate -a # dh_installemacsen -a @@ -187,10 +182,9 @@ binary-arch: build install dh_md5sums -a dh_builddeb -p $(pkg) ifneq (,$(findstring i386,$(host_arch))) - dh_builddeb -p $(pkg-p) + dh_builddeb -p $(pkg-p3) dh_builddeb -p $(pkg-p4) dh_builddeb -p $(pkg-athlon) - dh_builddeb -p $(pkg-athlon-mp) endif binary: binary-indep binary-arch -- 2.34.1