r3899: Automatic commit for debian_version_4_1_0-1

diff --git a/configure b/configure
index 98fb09e2f70af57f7f97be88508a84c9972b81e0..c6f9c909f851631e6a8473711cdaa1187087cb01 100755 (executable)
--- a/configure
+++ b/configure
@@ -7908,16 +7908,13 @@ if test "${with_mcpu+set}" = set; then
 
 fi;
 
-if test "$withval" == "pentium4" -o "$withval" == "athlon"  ; then
-  echo "$as_me:$LINENO: result: $withval" >&5
-echo "${ECHO_T}$withval" >&6
-  CFLAGS="$CFLAGS -mcpu=$withval"
-elif test "$withval" == "no"; then
+if  "$withval" == ""  ||  "$withval" == "no" ; then
   echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
 else
-  echo "$as_me:$LINENO: result: Unknown" >&5
-echo "${ECHO_T}Unknown" >&6
+  echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6
+  CFLAGS="$CFLAGS -mcpu=$withval"
 fi
 
 echo "$as_me:$LINENO: checking for web access" >&5

diff --git a/configure.ac b/configure.ac
index 34ca6c2d114ade8630b38067169d4dca7b95771f..e0fccd69c8ad1a50ca787b276f973b03da836823 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -246,13 +246,11 @@ AC_MSG_CHECKING([for CPU specification])
 AC_ARG_WITH(mcpu,
 [  --with-mcpu[=CPU]         Set name of CPU for gcc -mcpu])
 
-if test "$withval" == "pentium4" -o "$withval" == "athlon"  ; then
-  AC_MSG_RESULT([$withval])
-  CFLAGS="$CFLAGS -mcpu=$withval"
-elif test "$withval" == "no"; then
+if [ "$withval" == "" ] || [ "$withval" == "no" ]; then
   AC_MSG_RESULT([no])
 else
-  AC_MSG_RESULT([Unknown])
+  AC_MSG_RESULT([$withval])
+  CFLAGS="$CFLAGS -mcpu=$withval"
 fi
 
 AC_MSG_CHECKING([for web access])

diff --git a/debian/control b/debian/control
index ab2e9c077d70087b11a33cb86c5ac10530cadefd..c7dbc1025bc04dc5e6b7cf5ab992672fe3031105 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
+Conflicts: ctsim-pentium4, ctsim-athlon, ctsim-pentium, 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
+Conflicts: ctsim, ctsim-athlon, ctsim-athlon-mp, ctsim-pentium
 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
+Conflicts: ctsim, ctsim-pentium4, ctsim-pentium, 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
@@ -57,6 +57,42 @@ 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-pentium
+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-pentium
+Architecture: i386
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
+Recommends: ctsim-doc
+Conflicts: ctsim, ctsim-pentium4, ctsim-athlon, ctsim-athlon-mp
+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 optimizations.
+
 Package: ctsim-help
 Architecture: all
 Recommends: ctsim

diff --git a/debian/rules b/debian/rules
index 9dd19a4fa53b7f6a5d09e7137fca3a60b58baa9a..acf7720881d1fca1930b59441e1a6aacea02355a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,9 @@ host_arch     := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pkg            := ctsim
 pkg-p4         := ctsim-pentium4
+pkg-p          := ctsim-pentium
 pkg-athlon     := ctsim-athlon
+pkg-athlon-mp  := ctsim-athlon-mp
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc
 
@@ -21,13 +23,17 @@ ctsim-shared        := usr/share/ctsim
 
 prefix         := debian/$(pkg)
 prefix-p4      := debian/$(pkg-p4)
+prefix-p       := debian/$(pkg-p)
 prefix-athlon  := debian/$(pkg-athlon)
+prefix-athlon-mp:= debian/$(pkg-athlon-mp)
 prefix-help    := debian/$(pkg-help)
 prefix-doc     := debian/$(pkg-doc)
 
 DESTDIR                := `pwd`/$(prefix)
 DESTDIR-P4     := `pwd`/$(prefix-p4)
+DESTDIR-P      := `pwd`/$(prefix-p)
 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
@@ -79,10 +85,15 @@ install: build
        #
        dh_installdirs -p $(pkg-help) $(ctsim-shared)
        ${MAKE} install
-       echo Testing for i386 optimized builds
+       # Testing for i386 optimized builds
        echo Host architecture is $(host_arch)
 ifneq (,$(findstring i386,$(host_arch)))
-       echo Building CPU-specific i386 flavors
+       # Building CPU-specific i386 flavors
+       # Pentium 
+       ${MAKE} clean
+       ./configure --prefix=$(DESTDIR-P)/usr --mandir=$(DESTDIR-P)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium
+       $(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
@@ -93,10 +104,19 @@ 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-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-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)
@@ -167,8 +187,10 @@ 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-p4)
        dh_builddeb -p $(pkg-athlon)
+       dh_builddeb -p $(pkg-athlon-mp)
 endif
 
 binary: binary-indep binary-arch