r2093: *** empty log message ***

diff --git a/debian/control b/debian/control
index 69d99eaff7e7021892f40e62f228ac0f15c44795..a57b41a459883a8b09a3d0dd163c9d253f1cd0d8 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, ctsim-doc-pdf
+Suggests: ctsim-doc,
 Description: Computed Tomograpy Simulator
  CTSim provides an interactive computed tomography simulator.
 
@@ -24,13 +24,6 @@ Package: ctsim-doc
 Architecture: all
 Suggests: ctsim
 Description: Computed Tomograpy Simulator
- 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, 
+ This package provides HTML and PDF documentation files for CTSim, 
  a computed tomography simulator.
 

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

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

diff --git a/debian/ctsim-doc.doc-base b/debian/ctsim-doc.doc-base
index d70527be09f3881599ef947850a5773eb3fcd6a8..5969c250607f90cb3af6ba3a0d05fc237b902ae6 100644 (file)
--- a/debian/ctsim-doc.doc-base
+++ b/debian/ctsim-doc.doc-base
@@ -5,6 +5,9 @@ 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
+
 Format: 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 d2e8b2bda387d8d302d083358822b471595d39f6..2dce9b2d2c06e89b7a08fdcaa45524f36362267d 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -11,17 +11,14 @@ 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                := `pwd`/$(prefix)
 HELPDIR                := `pwd`/$(prefix-help)/usr/share/ctsim
 DOCDIR         := $(prefix-doc)/usr/share/doc/ctsim-doc
-PDFDIR         := $(prefix-doc-pdf)/usr/share/doc/ctsim-doc-pdf
 
 INSTALL                := install
 INSTALLFLAGS   := -g root -o root -m 0644
@@ -65,8 +62,8 @@ install: build
        $(INSTALL) $(INSTALLFLAGS) $(shell echo docs/html/*) $(DOCDIR)/html
        ln -sf $(pkg)_contents.html $(DOCDIR)/html/index.html
 
-       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(PDFDIR)
-       GZIP=-9 gzip $(PDFDIR)/ctsim.pdf
+       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(DOCDIR)
+       gzip -9 $(DOCDIR)/ctsim.pdf
 
 # Build architecture-independent files here.
 binary-indep: build install