r3907: Automatic commit for debian_version_4_1_0-1

diff --git a/debian/control b/debian/control
index c7dbc1025bc04dc5e6b7cf5ab992672fe3031105..3150a38b46727b305e9a95cf39e88e04c2d9c682 100644 (file)
--- 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-pentium, ctsim-athlon-mp
+Conflicts: ctsim-pentium4, ctsim-athlon, ctsim-pentium3, ctsim-athlon-mp
 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-pentium
+Conflicts: ctsim, ctsim-athlon, ctsim-athlon-mp, 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-pentium, ctsim-athlon-mp
+Conflicts: ctsim, ctsim-pentium4, ctsim-pentium3, ctsim-athlon-mp
 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
@@ -61,7 +61,7 @@ Package: ctsim-athlon-mp
 Architecture: i386
 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
 Recommends: ctsim-doc
-Conflicts: ctsim, ctsim-pentium4, ctsim-athlon, ctsim-pentium
+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
@@ -75,7 +75,7 @@ Description: Computed tomograpy simulator (Athlon-MP optimized)
  .
  This version of ctsim has been compiled using Athlon MP optimizations.
 
-Package: ctsim-pentium
+Package: ctsim-pentium3
 Architecture: i386
 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
 Recommends: ctsim-doc
@@ -91,7 +91,7 @@ Description: Computed tomograpy simulator (Pentium optimized)
  . 
  The home page for CTSim is http://www.ctsim.org.
  .
- This version of ctsim has been compiled using Pentium optimizations.
+ This version of ctsim has been compiled using Pentium 3 optimizations.
 
 Package: ctsim-help
 Architecture: all

diff --git a/debian/rules b/debian/rules
index acf7720881d1fca1930b59441e1a6aacea02355a..1a14078037ea151238ed8fd506800cb35ca81111 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ host_arch     := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pkg            := ctsim
 pkg-p4         := ctsim-pentium4
-pkg-p          := ctsim-pentium
+pkg-p3         := ctsim-pentium3
 pkg-athlon     := ctsim-athlon
 pkg-athlon-mp  := ctsim-athlon-mp
 pkg-help       := ctsim-help
@@ -23,7 +23,7 @@ ctsim-shared  := usr/share/ctsim
 
 prefix         := debian/$(pkg)
 prefix-p4      := debian/$(pkg-p4)
-prefix-p       := debian/$(pkg-p)
+prefix-p3      := debian/$(pkg-p3)
 prefix-athlon  := debian/$(pkg-athlon)
 prefix-athlon-mp:= debian/$(pkg-athlon-mp)
 prefix-help    := debian/$(pkg-help)
@@ -31,7 +31,7 @@ prefix-doc    := debian/$(pkg-doc)
 
 DESTDIR                := `pwd`/$(prefix)
 DESTDIR-P4     := `pwd`/$(prefix-p4)
-DESTDIR-P      := `pwd`/$(prefix-p)
+DESTDIR-P3     := `pwd`/$(prefix-p3)
 DESTDIR-ATHLON := `pwd`/$(prefix-athlon)
 DESTDIR-ATHLON-MP      := `pwd`/$(prefix-athlon-mp)
 HELPDIR                := `pwd`/$(prefix-help)/$(ctsim-shared)
@@ -89,9 +89,9 @@ install: build
        echo Host architecture is $(host_arch)
 ifneq (,$(findstring i386,$(host_arch)))
        # Building CPU-specific i386 flavors
-       # Pentium 
+       # Pentium 3
        ${MAKE} clean
-       ./configure --prefix=$(DESTDIR-P)/usr --mandir=$(DESTDIR-P)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium
+       ./configure --prefix=$(DESTDIR-P3)/usr --mandir=$(DESTDIR-P3)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium3
        $(MAKE) all
        ${MAKE} install
        # Pentium 4