r1898: *** empty log message ***

diff --git a/Makefile.am b/Makefile.am
index 562bf2ef4577c3187ff3cdc3b872b6609157ed69..b3c73307d1259ae3875e945e4aed35e6e416a228 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,12 @@ else
 EXTRA_DIRS3=
 endif
 
-SUBDIRS=man doc libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
+SUBDIRS=man libctsupport libctsim  html cgi-bin include $(EXTRA_DIRS1) $(EXTRA_DIRS2) $(EXTRA_DIRS3) tools helical
 
 EXTRA_DIST=acsite.m4 make.bat msvc/ctsim.dsw msvc/ctsimtext/ctsimtext.dsp msvc/libctsim/libctsim.dsp msvc/ctsim/ctsim.dsp
 
+install-data-hook: 
+       install -g root -o root -m 0644 docs/ctsim.htb $(datadir)
 
 
 

diff --git a/debian/changelog b/debian/changelog
index 721a3fd466bdc6200d248fe9305554c9b0f53e45..a7498fa7fdaec06807c5b2e9840ecf3a2f0f95e0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 ctsim (3.5.0-1) unstable; urgency=low
 
-  * Initial Release.
+  * Initial Release. (closes: #145724)
 
  -- Kevin Rosenberg <kevin@rosenberg.net>  Thu, 25 Apr 2002 19:13:41 -0600
 

diff --git a/debian/control b/debian/control
index f8792df3f1db2a9e3884874198d1a70601f50aab..3247fbc541d822d4e51910e43703a372c7eba40c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: ctsim
 Section: science
 Priority: optional
-Maintainer: Kevin Rosenberg <kevin@rosenberg.net>
+Maintainer: Barak A. Pearlmutter <bap@debian.org>
 Build-Depends: debhelper (>> 3.0.0), wxwin2.2-headers, fftw-dev, libreadline4-dev, xlibmesa-dev, libwxgtk2.2-dev , glutg3-dev
 Standards-Version: 3.5.2
 

diff --git a/debian/rules b/debian/rules
index b4c500d738dd4655ca1b666e9bf772332bc0d17f..fd877b9f2f9bdd4f7051108fa80cb04059cb180c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -51,9 +51,9 @@ install: build
        dh_installdirs
        # Add here commands to install the package into debian/ctsim.
        ${MAKE} install
-       $(INSTALL) $(INSTALLFLAGS) $(shell echo doc/html/*) $(SHAREDOCDIR)/html
+       $(INSTALL) $(INSTALLFLAGS) $(shell echo docs/html/*) $(SHAREDOCDIR)/html
        ln -sf $(pkg)_contents.html $(SHAREDOCDIR)/html/index.html
-       $(INSTALL) $(INSTALLFLAGS) doc/ctsim.pdf $(SHAREDOCDIR)
+       $(INSTALL) $(INSTALLFLAGS) docs/ctsim.pdf $(SHAREDOCDIR)
        GZIP=-9 gzip $(SHAREDOCDIR)/ctsim.pdf
 
 # Build architecture-independent files here.

diff --git a/make-dist.sh b/make-dist.sh
index 49199982787b610388d79eb0323e180314370947..b846a69bc5b8863905db1943be2bc834468493a6 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -30,13 +30,12 @@ cp -a ${TOPDIR} ${DISTDIR}
 # Remove junk from distribution dir
 pushd ${DISTDIR}
 make distclean
-popd
-rm -f `find ${DISTDIR} -type f -name .cvsignore`
-rm -rf `find ${DISTDIR} -type d -name CVS`
-rm -f `find ${DISTDIR} -type f -name '*~' -or -name '.*~' -or \
+rm -f `find . -type f -name .cvsignore`
+rm -rf `find . -type d -name CVS`
+rm -f `find . -type f -name '*~' -or -name '.*~' -or \
    -name '.#*' -or -name '#*#' -or -name '*.fig' -or -name '*.psd'`
-
-rm -rf ${DISTDIR}/images ${DISTDIR}/copy ${DISTDIR}/make-dist.sh
+rm -rf images copy make-dist.sh make-doc.sh doc
+popd
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian

diff --git a/make-doc.sh b/make-doc.sh
new file mode 100755 (executable)
index 0000000..108534a
--- /dev/null
+++ b/make-doc.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+pushd doc
+make all
+popd
+rm -rf docs
+mkdir docs
+mv doc/html docs
+mv doc/ctsim.htb docs
+mv doc/ctsim.pdf docs
+mv doc/ctsim.ps docs
+pushd doc
+make clean
+popd