r2081: *** empty log message ***

diff --git a/debian/ctsim-doc.doc-base b/debian/ctsim-doc.doc-base
new file mode 100644 (file)
index 0000000..b16bfa9
--- /dev/null
+++ b/debian/ctsim-doc.doc-base
@@ -0,0 +1,15 @@
+Document: ctsim
+Title: CTSim
+Author: Kevin M. Rosenberg
+Abstract: This manual describes the theory
+ and use of CTSim - A Computed Tomography Simulator.
+Section: math
+
+Format: PDF
+Files: /usr/share/doc/ctsim/ctsim.pdf.gz
+
+Format: HTML
+Index: /usr/share/doc/ctsim/html/index.html
+Files: /usr/share/doc/ctsim/html/*.html
+
+  

diff --git a/debian/ctsim.dirs b/debian/ctsim.dirs
index a3090d2bdefb8cb6f6e3e965e86745d9872eb026..a49ad57bec27e0403b068f18ce89517a474d589a 100644 (file)
--- a/debian/ctsim.dirs
+++ b/debian/ctsim.dirs
@@ -6,3 +6,10 @@ usr/share/doc
 usr/share/doc/ctsim
 usr/share/man
 usr/share/man/man1
+usr/X11R6
+usr/X11R6/include
+usr/X11R6/include/X11
+usr/X11R6/include/X11/pixmaps
+
+
+

diff --git a/debian/ctsim.doc-base b/debian/ctsim.doc-base
deleted file mode 100644 (file)
index b16bfa9..0000000
--- a/debian/ctsim.doc-base
+++ /dev/null
@@ -1,15 +0,0 @@
-Document: ctsim
-Title: CTSim
-Author: Kevin M. Rosenberg
-Abstract: This manual describes the theory
- and use of CTSim - A Computed Tomography Simulator.
-Section: math
-
-Format: PDF
-Files: /usr/share/doc/ctsim/ctsim.pdf.gz
-
-Format: HTML
-Index: /usr/share/doc/ctsim/html/index.html
-Files: /usr/share/doc/ctsim/html/*.html
-
-  

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

diff --git a/debian/ctsim.xpm b/debian/ctsim.xpm
new file mode 100644 (file)
index 0000000..0a65f24
--- /dev/null
+++ b/debian/ctsim.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * logo_xpm[] = {
+"32 32 9 1",
+"      c None",
+".     c #FFFFFF",
+"+     c #E5E5E5",
+"@     c #CCCCCC",
+"#     c #B2B2B2",
+"$     c #FFFF00",
+"%     c #7F7F00",
+"&     c #999999",
+"*     c #7F7F7F",
+"...........++@@+@@++++..........",
+"........++++.......+++++........",
+".......+++.............+@+......",
+".....+++.................++.....",
+".........+................++....",
+"....#$+....................++...",
+"..+++$$$$@+++......+........++..",
+"..+.+$$$$$$$$$@@+............+..",
+".++..$$$$$$$$%$$$$$@+..+.....++.",
+".++.++$$$$$$$$$$$$$$$$$#@+....+.",
+"++....$$$$$$$$$%%$$$$$$$$$$$$@++",
+"++....$$$$$$$$%$$%%$$$$$$$$$$$$@",
+"++....@$%$$$%%$$$$$%$$$$$$$$$$$#",
+"+......$$$$$$$%$$%$$$$$%$$$$$$$&",
+"+......$$$$$%$%$$%$%$$$$$$$$$$$%",
+"@......@%$$$$$$%%$$$%$$$$$$$$$$$",
+"@......+$$$$%$$%%$$$$$$$$$$$$%$%",
+"+......+*$$$%$$$$%$%%$$$$$$$$$$%",
+"+.......@$$$$$$$$$$%$$$$$$$$$$$&",
+"++......+$$$$%$%%$$%$$$$$$$$$$$#",
+"++.......$$$$%$$$$%$$$%$$$$$$$$#",
+".+.......@$$$$$%$%$$$$$$$$$$$$%+",
+".++......+$$%$$$$$$$$$$$$$$$$$@.",
+".++......+$$$$$$$$%$$$$$$$$$$%+.",
+"..++......@$$$$$$$$$$$$$$$$$$#..",
+"...+......+$$$$$$$$$$$$$$$$$*+..",
+"...+++.....$$$$$$$$$$$$$$$$$@...",
+"....++.....$$$$$$$$$$$$$$$%+....",
+"......++...+$$$$$$$$$$$$$*@.....",
+".......+++..$$$$$$$$$$$%&.......",
+"........++++@$$$$$$$$%&+........",
+"..........++@&%*$%&#@+.........."};

diff --git a/debian/rules b/debian/rules
index ef0708a1e890dcb8bf92959576d02b60a93d799a..394bfe22be7ff0f88f3e267f99377090ce64a9de 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,24 @@
 # GNU copyright 1997 to 1999 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+export DH_VERBOSE=0
 
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
-pkg    := ctsim
-prefix := debian/$(pkg)
-DESTDIR := `pwd`/$(prefix)
-SHAREDOCDIR := $(DESTDIR)/usr/share/doc/$(pkg)
-SHAREDATADIR := $(DESTDIR)/usr/share/$(pkg)/.
+pkg            := ctsim
+pkg-help       := ctsim-help
+pkg-doc                := ctsim-doc
 
-INSTALL        := install
+prefix         := debian/$(pkg)
+prefix-help    := debian/$(pkg-help)
+prefix-doc     := debian/$(pkg-doc)
+
+DESTDIR                := $(prefix)
+HELPDIR                := $(prefix-help)/usr/share/ctsim
+DOCDIR         := $(prefix-doc)/usr/share/doc/$(pkg-doc)
+
+INSTALL                := install
 INSTALLFLAGS   := -g root -o root -m 0644
 INSTALLDIRFLAGS        := -d -g root -o root -m 0755
 
@@ -22,7 +28,7 @@ configure: configure-stamp
 configure-stamp:
        dh_testdir
        # Add here commands to configure the package.
-       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(SHAREDATADIR)
+       ./configure --prefix=$(DESTDIR)/usr --mandir=$(DESTDIR)/usr/share/man --datadir=$(HELPDIR)
        touch configure-stamp
 
 
@@ -49,12 +55,13 @@ install: build
        dh_testroot
        dh_clean -k
        dh_installdirs
-       # Add here commands to install the package into debian/ctsim.
+       # Below command also installs helpfile
        ${MAKE} install
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo docs/html/*) $(SHAREDOCDIR)/html
-       ln -sf $(pkg)_contents.html $(SHAREDOCDIR)/html/index.html
-       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(SHAREDOCDIR)
-       GZIP=-9 gzip $(SHAREDOCDIR)/ctsim.pdf
+       $(INSTALL) $(INSTALLFLAGS) debian/ctsim.xpm $(prefix)/usr/X11R6/include/X11/pixmaps
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo docs/html/*) $(DOCDIR)/html
+       ln -sf $(pkg)_contents.html $(DOCDIR)/html/index.html
+       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(DOCDIR)
+       GZIP=-9 gzip $(DOCDIR)/ctsim.pdf
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -67,7 +74,7 @@ binary-arch: build install
 #      dh_installdebconf       
        dh_installdocs docs/html
        dh_installexamples tools/sample-ctsim.sh helical/sample-helical.sh
-#      dh_installmenu
+       dh_installmenu
 #      dh_installlogrotate
 #      dh_installemacsen
 #      dh_installpam