r3893: Automatic commit for debian_version_4_1_0-1

diff --git a/debian/control b/debian/control
index d5b68c5e55a13d5977bfc44d073261223f623825..5f776db225d330d30f89579d5a96899ea404c80f 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: ctsim
 Section: science
 Priority: optional
 Maintainer: Kevin M. Rosenberg <kmr@debian.org>
-Build-Depends: debhelper (>= 4.0.0), wxwin2.4-headers, fftw-dev, libreadline4-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, libwxgtk2.4-dev, ctn-dev, libpng12-0-dev
+Build-Depends: debhelper (>= 4.0.0), wxwin2.4-headers, fftw-dev, libreadline4-dev, xlibmesa-gl-dev, xlibmesa-glu-dev, libwxgtk2.4-dev, ctn-dev, libpng12-0-dev, dpkg-dev
 Standards-Version: 3.5.8.0
 
 Package: ctsim

diff --git a/debian/ctsim-athlon.menu b/debian/ctsim-athlon.menu
new file mode 100644 (file)
index 0000000..8d73c32
--- /dev/null
+++ b/debian/ctsim-athlon.menu
@@ -0,0 +1,4 @@
+?package(ctsim-athlon):needs="X11" section="Apps/Math"\
+    title="CtSim" icon="/usr/X11R6/include/X11/pixmaps/ctsim.xpm"\
+    command="/usr/bin/ctsim"\
+    hints="Computed Tomograpy Simulator"

diff --git a/debian/ctsim-pentium4.menu b/debian/ctsim-pentium4.menu
new file mode 100644 (file)
index 0000000..66ee5da
--- /dev/null
+++ b/debian/ctsim-pentium4.menu
@@ -0,0 +1,4 @@
+?package(ctsim-pentium4):needs="X11" section="Apps/Math"\
+    title="CtSim" icon="/usr/X11R6/include/X11/pixmaps/ctsim.xpm"\
+    command="/usr/bin/ctsim"\
+    hints="Computed Tomograpy Simulator"

diff --git a/debian/rules b/debian/rules
index 17539538886538213055fc232233ecd595820a15..ff7c2d94f6c88158ccd0a8fc4d17349722b8fc6d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,15 @@
 
 export DH_COMPAT=4
 
+ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
+       CFLAGS += -g
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+       INSTALL_PROGRAM += -s
+endif
+
+host_arch      := $(dpkg-architecture -qDEB_HOST_ARCH)
+
 pkg            := ctsim
 pkg-p4         := ctsim-pentium4
 pkg-athlon     := ctsim-athlon
@@ -23,6 +32,7 @@ HELPDIR               := `pwd`/$(prefix-help)/$(ctsim-shared)
 doc-dir                := usr/share/doc/$(pkg-doc)
 pixmap-dir     := usr/X11R6/include/X11/pixmaps
 
+
 configure: configure-stamp
 configure-stamp:
        dh_testdir
@@ -38,14 +48,18 @@ build-arch-stamp:
        ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR) --with-ctn
        $(MAKE) all
        ${MAKE} install
+ifeq ($(host_arch),i386)
+       # 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
+       # 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
+endif
        touch build-arch-stamp
 
 build-indep: configure-stamp  build-indep-stamp