r3886: Auto commit for Debian build

diff --git a/debian/changelog b/debian/changelog
index 353a2bd564cf89e53c2e1a69ad8034e6eee4c03d..193ac16a4958036e564cd48fc276d67c91f83d20 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
+ctsim (4.1.0-1) unstable; urgency=low
+
+  * Add Pentium 4 and Athlon optimized packages
+
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 30 Jan 2003 15:40:35 -0700
+
 ctsim (4.0.2-1) unstable; urgency=low
 
   * Remove debugging statement
   * Add support for --with-cpu configuration option
   * Fix OpenGL frames from endlessly repainting
        
- -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 29 Jan 2003 19:25:11 -0700
+ -- Kevin M. Rosenberg <kmr@debian.org>  Thu, 30 Jan 2003 15:40:18 -0700
 
 ctsim (4.0.1-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index aa609a70cce359c7efa6e9464cce3f3d7e859000..50e85e8bc4a5fea873be626311b7311b4e5d0466 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -20,6 +20,40 @@ Description: Computed Tomograpy Simulator
  . 
  The home page for CTSim is http://www.ctsim.org.
 
+Package: ctsim-pentium4
+Architecture: i386
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
+Recommends: ctsim-doc
+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
+ 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 4 optimizations.
+
+Package: ctsim-athlon
+Architecture: i386
+Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
+Recommends: ctsim-doc
+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
+ 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 optimizations.
+
 Package: ctsim-help
 Architecture: all
 Recommends: ctsim

diff --git a/debian/rules b/debian/rules
index 758a7d7b50ca2d5ef468bdca2332cb86a025d5bc..96f290dadaeb3ee3176270bc953917451d07a8c3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,14 +3,20 @@
 export DH_COMPAT=4
 
 pkg            := ctsim
+pkg-p4         := ctsim-pentium4
+pkg-athlon     := ctsim-athlon
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc
 
 prefix         := debian/$(pkg)
+prefix-p4      := debian/$(pkg-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-ATHLON := `pwd`/$(prefix-athlon)
 HELPDIR                := `pwd`/$(prefix-help)/usr/share/ctsim
 doc-dir                := usr/share/doc/$(pkg-doc)
 pixmap-dir     := usr/X11R6/include/X11/pixmaps
@@ -19,7 +25,6 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn
        touch configure-stamp
 
 
@@ -27,7 +32,17 @@ build-arch: configure-stamp build-arch-stamp
 build-arch-stamp:
        dh_testdir
        # Add here commands to compile the package.
+       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn
+       $(MAKE) all
+       ${MAKE} install
+       ${MAKE} clean
+       ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --mcpu=pentium4
        $(MAKE) all
+       ${MAKE} install
+       ${MAKE} clean
+       ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --mcpu=athlon
+       $(MAKE) all
+       ${MAKE} install
        touch build-arch-stamp
 
 build-indep: configure-stamp  build-indep-stamp
@@ -58,10 +73,9 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       # Add here commands to install the package into debian/uffi.
-       ${MAKE} install
-       dh_installdirs -p $(pkg) $(pixmap-dir)
-       dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir)
+       # Add here commands to install the package into debian/ctsim.
+       dh_installdirs -p $(pkg-help) $(pixmap-dir)
+       dh_install -p $(pkg-help) debian/ctsim.xpm $(pixmap-dir)
        dh_install -p $(pkg-doc) docs/html $(doc-dir)
        dh_link -p $(pkg-doc) $(doc-dir)/html/$(pkg)_contents.html $(doc-dir)/html/index.html
        gzip -9 docs/ctsim.pdf