r2213: *** empty log message ***

diff --git a/debian/changelog b/debian/changelog
index ad42e81472cca9f71817364f21952b15376d97cb..f72597198d042e85c37499dd49270f2767cca758 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ctsim (3.5.7-1) unstable; urgency=low
   * New upstream source
   
   * Additions to copyright file
+  
+  * Clean up building scripts
 
  -- Kevin M. Rosenberg <kevin@rosenberg.net>  Fri, 28 Jun 2002 11:12:35 -0600
 

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

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

diff --git a/debian/ctsim.dirs b/debian/ctsim.dirs
deleted file mode 100644 (file)
index a49ad57..0000000
--- a/debian/ctsim.dirs
+++ /dev/null
@@ -1,15 +0,0 @@
-usr
-usr/bin
-usr/share
-usr/share/ctsim
-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/rules b/debian/rules
index 892bb6d8c02d751bb2a3afcc5f20d6ab8e7a1880..d81103bc73f10751b3fd99e64d02317ebf444181 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -18,11 +18,8 @@ prefix-doc   := debian/$(pkg-doc)
 
 DESTDIR                := `pwd`/$(prefix)
 HELPDIR                := `pwd`/$(prefix-help)/usr/share/ctsim
-DOCDIR         := $(prefix-doc)/usr/share/doc/ctsim-doc
-
-INSTALL                := install
-INSTALLFLAGS   := -g root -o root -m 0644
-INSTALLDIRFLAGS        := -d -g root -o root -m 0755
+doc-dir                := usr/share/doc/$(pkg-doc)
+pixmap-dir     := usr/X11R6/include/X11/pixmaps
 
 configure: configure-stamp
 configure-stamp:
@@ -57,13 +54,13 @@ install: build
        dh_installdirs
        # Below command also installs helpfile, man pages
        ${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
+       dh_installdirs -p $(pkg) $(pixmap-dir)
+       dh_install -p $(pkg) debian/ctsim.xpm $(pixmap-dir)
 
-       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(DOCDIR)
-       gzip -9 $(DOCDIR)/ctsim.pdf
+       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
+       gzip -9 docs/ctsim.pdf
+       dh_install -p $(pkg-doc) docs/ctsim.pdf.gz $(doc-dir)
 
 # Build architecture-independent files here.
 binary-indep: build install

diff --git a/docs/ctsim.htb b/docs/ctsim.htb
new file mode 100644 (file)
index 0000000..eed69a8
Binary files /dev/null and b/docs/ctsim.htb differ

diff --git a/docs/ctsim.pdf b/docs/ctsim.pdf
new file mode 100644 (file)
index 0000000..45500ee
Binary files /dev/null and b/docs/ctsim.pdf differ

diff --git a/docs/html.tar.gz b/docs/html.tar.gz
new file mode 100644 (file)
index 0000000..f731797
Binary files /dev/null and b/docs/html.tar.gz differ