r11769: remove pentium4 optimized version

diff --git a/debian/changelog b/debian/changelog
index fc47e1f6e672eeccd3711891fcc887cb38bd15e9..d5736a5a84f27c7a248e00fc539ff1af0b47069a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 ctsim (4.5.3-2) unstable; urgency=low
 
   * debian/watch: Update to version 3
+  * debian/{control,rules}: Removed optimized pentium4 binary
 
- -- Kevin M. Rosenberg <kmr@debian.org>  Wed, 18 Jul 2007 20:24:14 -0600
+ -- Kevin M. Rosenberg <kmr@debian.org>  Mon, 23 Jul 2007 21:17:16 -0600
 
 ctsim (4.5.3-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 115e13c27b3fbe52435430d2e67a557b3dac3e3d..2bc00c9657bda7e1b3743876d06d2a5067fcd4ad 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -22,26 +22,6 @@ Description: Computed tomography simulator
  . 
  Home page: http://www.ctsim.org/
 
-Package: ctsim-pentium4
-Architecture: i386 kfreebsd-i386
-Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn, libwxgtk2.4-1, fftw3, xlibmesa-gl | libgl1, libpng12-0
-Recommends: ctsim-doc
-Provides: ctsim
-Replaces: ctsim
-Conflicts: ctsim
-Description: Computed tomography 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-help
 Architecture: all
 Recommends: ctsim

diff --git a/debian/rules b/debian/rules
index 38ecda8e5a0275c6823556590c554f4e5dc194ac..164c1ebdec88e9d71df06f3c3be776b9dd5db6a8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -10,19 +10,16 @@ endif
 host_arch      := $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 pkg            := ctsim
-pkg-p4         := ctsim-pentium4
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc
 
 ctsim-shared   := usr/share/ctsim
 
 prefix         := debian/$(pkg)
-prefix-p4      := debian/$(pkg-p4)
 prefix-help    := debian/$(pkg-help)
 prefix-doc     := debian/$(pkg-doc)
 
 DESTDIR                := `pwd`/$(prefix)
-DESTDIR-P4     := `pwd`/$(prefix-p4)
 HELPDIR                := `pwd`/$(prefix-help)/$(ctsim-shared)
 doc-dir                := usr/share/doc/$(pkg-doc)
 pixmap-dir     := usr/share/pixmaps
@@ -60,8 +57,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-arch-stamp build-indep-stamp configure-stamp
-       # Add here commands to clean up after the build process.
-       -$(MAKE) distclean
+       if [ -f Makefile ]; then $(MAKE) clean; fi
        find . -type f -and -name \*~ -or -name .\*~ -exec rm -f {} \;
        rm -f debian/ctsim.postinst.* debian/ctsim.prerm.*
        # Ensure up-to-date versions of config.sub and config.guess
@@ -78,23 +74,6 @@ install: build
        #
        dh_installdirs -p $(pkg-help) $(ctsim-shared)
        ${MAKE} install
-       # Testing for i386 optimized builds
-       echo Host architecture is $(host_arch)
-ifneq (,$(findstring i386,$(host_arch)))
-       # Building CPU-specific i386 flavors
-       # Pentium 4
-       ${MAKE} clean
-       ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium4
-       $(MAKE) all
-       ${MAKE} install
-
-       dh_installdirs -p $(pkg-p4) $(pixmap-dir)
-       dh_installdirs -p $(pkg-p4) $(desktop-dir)
-       dh_install -p $(pkg-p4) debian/ctsim.xpm $(pixmap-dir)
-       dh_install -p $(pkg-p4) debian/ctsim.desktop $(desktop-dir)
-
-endif
-       # Add here commands to install the package into debian/ctsim.
        dh_installdirs -p $(pkg) $(pixmap-dir)
        dh_installdirs -p $(pkg) $(desktop-dir)
        dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir)
@@ -131,23 +110,6 @@ binary-arch: build install
        dh_testroot -a
        dh_installdocs -a
        dh_installexamples -p $(pkg) tools/sample-ctsim.sh helical/sample-helical.sh
-ifneq (,$(findstring i386,$(host_arch)))
-       dh_installexamples -p $(pkg-p4) tools/sample-ctsim.sh helical/sample-helical.sh
-endif
-
-ifeq (,$(findstring i386,$(host_arch)))
-       dh_installchangelogs -p $(pkg) ChangeLog 
-       dh_strip -p $(pkg)
-       dh_link -p $(pkg)
-       dh_compress -p $(pkg)
-       dh_fixperms -p $(pkg)
-       dh_installmenu -p $(pkg)
-       dh_installdeb -p $(pkg)
-       dh_gencontrol -p $(pkg)
-       dh_shlibdeps -p $(pkg)
-       dh_md5sums -p $(pkg)
-       dh_builddeb -p $(pkg)
-else
        dh_installchangelogs ChangeLog -a
        dh_strip -a
        dh_link -a
@@ -159,7 +121,6 @@ else
        dh_shlibdeps -a
        dh_md5sums -a
        dh_builddeb -a
-endif
 
 binary: binary-indep binary-arch