From d20f7a2bf14365c2e3e1fac51f154f1ae761d08a Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Mon, 16 Oct 2006 17:33:55 +0000 Subject: [PATCH] r11226: remove athlon binary --- debian/changelog | 1 + debian/control | 21 --------------------- debian/rules | 32 ++------------------------------ 3 files changed, 3 insertions(+), 51 deletions(-) diff --git a/debian/changelog b/debian/changelog index a345842..82c194b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ ctsim (4.5.0-1) unstable; urgency=low * New upstream + * debian/{control,rules}: Removed optimized athlon binary -- Kevin M. Rosenberg Mon, 16 Oct 2006 10:57:24 -0600 diff --git a/debian/control b/debian/control index 70ccd8b..115e13c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,6 @@ Section: science Priority: extra Maintainer: Kevin M. Rosenberg Build-Depends: debhelper (>= 4.0.0), wx2.4-headers, fftw3-dev, libreadline5-dev, xlibmesa-gl-dev, libglu1-xorg-dev, libwxgtk2.4-dev, ctn-dev, libpng12-dev, libglib1.2-dev, libgtk1.2-dev -Build-Depends-Indep: debhelper (>= 4.0.0) Standards-Version: 3.7.2.2 Package: ctsim @@ -43,26 +42,6 @@ Description: Computed tomography simulator (Pentium 4 optimized) . This version of ctsim has been compiled using Pentium 4 optimizations. -Package: ctsim-athlon -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 (Athlon 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 ee8a157..0678a20 100755 --- a/debian/rules +++ b/debian/rules @@ -11,7 +11,6 @@ host_arch := $(shell dpkg-architecture -qDEB_HOST_ARCH) pkg := ctsim pkg-p4 := ctsim-pentium4 -pkg-athlon := ctsim-athlon pkg-help := ctsim-help pkg-doc := ctsim-doc @@ -19,13 +18,11 @@ ctsim-shared := usr/share/ctsim 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)/$(ctsim-shared) doc-dir := usr/share/doc/$(pkg-doc) pixmap-dir := usr/share/pixmaps @@ -90,19 +87,11 @@ ifneq (,$(findstring i386,$(host_arch))) ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=pentium4 $(MAKE) all ${MAKE} install - # Athlon - ${MAKE} clean - ./configure --prefix=$(DESTDIR-ATHLON)/usr --mandir=$(DESTDIR-ATHLON)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon - $(MAKE) all - ${MAKE} install + dh_installdirs -p $(pkg-p4) $(pixmap-dir) dh_installdirs -p $(pkg-p4) $(desktop-dir) - dh_installdirs -p $(pkg-athlon) $(pixmap-dir) - dh_installdirs -p $(pkg-athlon) $(desktop-dir) dh_install -p $(pkg-p4) debian/ctsim.xpm $(pixmap-dir) dh_install -p $(pkg-p4) debian/ctsim.desktop $(desktop-dir) - dh_install -p $(pkg-athlon) debian/ctsim.xpm $(pixmap-dir) - dh_install -p $(pkg-athlon) debian/ctsim.desktop $(desktop-dir) endif # Add here commands to install the package into debian/ctsim. @@ -118,7 +107,6 @@ endif gunzip docs/ctsim.pdf.gz chmod +x helical/*.sh tools/*.sh -# Build architecture-independent files here. # Pass -i to all debhelper commands in this target to reduce clutter. binary-indep: build install dh_testdir -i @@ -145,11 +133,8 @@ binary-arch: build install 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 - dh_installexamples -p $(pkg-athlon) tools/sample-ctsim.sh helical/sample-helical.sh endif - -ifeq (,$(findstring i386,$(host_arch))) - dh_installchangelogs -p $(pkg)ChangeLog + dh_installchangelogs -p $(pkg) ChangeLog dh_strip -p $(pkg) dh_link -p $(pkg) dh_compress -p $(pkg) @@ -160,19 +145,6 @@ ifeq (,$(findstring i386,$(host_arch))) dh_shlibdeps -p $(pkg) dh_md5sums -p $(pkg) dh_builddeb -p $(pkg) -else - dh_installchangelogs ChangeLog -a - dh_strip -a - dh_link -a - dh_compress -a - dh_fixperms -a - dh_installmenu -a - dh_installdeb -a - dh_gencontrol -a - dh_shlibdeps -a - dh_md5sums -a - dh_builddeb -a -endif binary: binary-indep binary-arch -- 2.34.1