r2082: *** empty log message ***

diff --git a/debian/control b/debian/control
index d4d30cdd635daf259aa5c01f7c083a22aebb1d37..e9007fbb9687957c5e2563c8ee5b328c3ab621bb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.5.2
 Package: ctsim
 Architecture: any
 Depends: fftw2, libwxgtk2.2, libreadline4, glutg3, xlibmesa3, ctsim-help
-Suggests: ctsim-doc
+Suggests: ctsim-doc, ctsim-doc-pdf
 Description: Computed Tomograpy Simulator
  CTSim provides an interactive computed tomography simulator.
 
@@ -25,6 +25,14 @@ Package: ctsim-doc
 Architecture: all
 Suggests: ctsim
 Description: Computed Tomograpy Simulator
- This package provides the offline documentation files for CTSim, 
+ This package provides HTML documentation files for CTSim, 
+ a computed tomography simulator.
+
+
+Package: ctsim-doc-pdf
+Architecture: all
+Suggests: ctsim
+Description: Computed Tomograpy Simulator
+ This package provides a PDF documentation file for CTSim, 
  a computed tomography simulator.
 

diff --git a/debian/ctsim-doc-pdf.dirs b/debian/ctsim-doc-pdf.dirs
new file mode 100644 (file)
index 0000000..84ea06a
--- /dev/null
+++ b/debian/ctsim-doc-pdf.dirs
@@ -0,0 +1,5 @@
+usr
+usr/share
+usr/share/doc
+usr/share/doc/ctsim
+

diff --git a/debian/ctsim-doc-pdf.doc-base b/debian/ctsim-doc-pdf.doc-base
new file mode 100644 (file)
index 0000000..a0f9296
--- /dev/null
+++ b/debian/ctsim-doc-pdf.doc-base
@@ -0,0 +1,11 @@
+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-doc/ctsim.pdf.gz
+
+  

diff --git a/debian/ctsim-doc.doc-base b/debian/ctsim-doc.doc-base
index b16bfa9bb237f5b954afaa0d5b53c05cce36ef57..d70527be09f3881599ef947850a5773eb3fcd6a8 100644 (file)
--- a/debian/ctsim-doc.doc-base
+++ b/debian/ctsim-doc.doc-base
@@ -5,11 +5,8 @@ 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
+Index: /usr/share/doc/ctsim-doc/html/index.html
+Files: /usr/share/doc/ctsim-doc/html/*.html
 
   

diff --git a/debian/rules b/debian/rules
index 394bfe22be7ff0f88f3e267f99377090ce64a9de..3c492176908b4e61fc96cff1409aefbb346394a7 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,14 +11,17 @@ export DH_COMPAT=3
 pkg            := ctsim
 pkg-help       := ctsim-help
 pkg-doc                := ctsim-doc
+pkg-doc-pdf    := ctsim-doc-pdf
 
 prefix         := debian/$(pkg)
 prefix-help    := debian/$(pkg-help)
 prefix-doc     := debian/$(pkg-doc)
+prefix-doc-pdf := debian/$(pkg-doc-pdf)
 
 DESTDIR                := $(prefix)
 HELPDIR                := $(prefix-help)/usr/share/ctsim
-DOCDIR         := $(prefix-doc)/usr/share/doc/$(pkg-doc)
+DOCDIR         := $(prefix-doc)/usr/share/doc/ctsim-doc
+PDFDIR         := $(prefix-doc-pdf)/usr/share/doc/ctsim-doc
 
 INSTALL                := install
 INSTALLFLAGS   := -g root -o root -m 0644
@@ -58,10 +61,12 @@ install: build
        # Below command also installs helpfile
        ${MAKE} install
        $(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
+
+       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(PDFDIR)
+       GZIP=-9 gzip $(PDFDIR)/ctsim.pdf
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -72,7 +77,7 @@ binary-arch: build install
        dh_testdir
        dh_testroot
 #      dh_installdebconf       
-       dh_installdocs docs/html
+       dh_installdocs -A docs/html
        dh_installexamples tools/sample-ctsim.sh helical/sample-helical.sh
        dh_installmenu
 #      dh_installlogrotate