r3891: Automatic commit for debian_version_4_1_0-1

diff --git a/Makefile.am b/Makefile.am
index bf03d3da635968b8d00446b5eb714f2498cc448f..bee1a467c5dd18a90ae0fe9e31853ecbd8d78443 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,8 +21,8 @@ SUBDIRS=man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_D
 EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
 
 #install-data-hook: 
-#      test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
-#      install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
+       #test -d $(datadir) || mkdir -p $(datadir) && chmod 0755 $(datadir)
+       #install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
 
 
 

diff --git a/debian/control b/debian/control
index 50e85e8bc4a5fea873be626311b7311b4e5d0466..d5b68c5e55a13d5977bfc44d073261223f623825 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,7 @@ Package: ctsim
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
 Recommends: ctsim-doc
+Conflicts: ctsim-pentium4, ctsim-athlon
 Description: Computed Tomograpy Simulator
  CTSim provides an interactive computed tomography simulator. Computed
  tomography is the technique of estimating the interior of an object
@@ -24,6 +25,7 @@ Package: ctsim-pentium4
 Architecture: i386
 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
 Recommends: ctsim-doc
+Conflicts: ctsim, ctsim-athlon
 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
@@ -41,6 +43,7 @@ Package: ctsim-athlon
 Architecture: i386
 Depends: ${misc:Depends}, ${shlibs:Depends}, ctsim-help, ctn
 Recommends: ctsim-doc
+Conflicts: ctsim, ctsim-pentium4
 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

diff --git a/debian/rules b/debian/rules
index 9de1b7f008c1c01fe4331bbf38aa00fe07da8e03..17539538886538213055fc232233ecd595820a15 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,7 +43,7 @@ build-arch-stamp:
        $(MAKE) all
        ${MAKE} install
        ${MAKE} clean
-       ./configure --prefix=$(DESTDIR-P4)/usr --mandir=$(DESTDIR-P4)/usr/share/man --datadir=$(HELPDIR) --with-ctn --mcpu=athlon
+       ./configure --prefix=$(DESTDIR-ATHLON)/usr --mandir=$(DESTDIR-ATHLON)/usr/share/man --datadir=$(HELPDIR) --with-ctn --with-mcpu=athlon
        $(MAKE) all
        ${MAKE} install
        touch build-arch-stamp
@@ -77,8 +77,12 @@ install: build
        dh_clean -k
        dh_installdirs
        # 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_installdirs -p $(pkg) $(pixmap-dir)
+       dh_installdirs -p $(pkg-p4) $(pixmap-dir)
+       dh_installdirs -p $(pkg-athlon) $(pixmap-dir)
+       dh_install -p $(pkg) 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-help) docs/ctsim.htb $(ctsim-shared)
        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