r1930: *** empty log message ***

diff --git a/cvsbp-prepare b/cvsbp-prepare
index 4c327702094b2bbc48a4f7a264a465fb902d76f4..a5746cbffdc330af62e500b80144bf7e72e43d95 100755 (executable)
--- a/cvsbp-prepare
+++ b/cvsbp-prepare
@@ -1,26 +1,6 @@
 #!/bin/bash
 
-# Try to copy documentation from Work dir
-CWD=`pwd`
-BASENAME=`basename ${CWD}`
-BASEDIR=`echo ${BASENAME} | sed -n 's/-[0-9].*$//p'`
-DOCDIR=/usr/local/src/Work/${BASEDIR}/doc
-
-if [ -d ${DOCDIR} -a -d doc ]; then
-  echo "Copying documentation"
-  cp -a ${DOCDIR}/html ${DOCDIR}/*.pdf doc/.
-else
-  echo "Unable to find documentation directory"
-fi
-
 # Clean checked out CVS directory
-rm -f upload.sh make-dist.sh make-doc.sh cvsbp-prepare
+rm -f upload.sh make-dist.sh make-doc.sh
 rm -f `find . -type f -name .cvsignore`
-
-# Try to build documentation 
-# Not used because PDF created at difference times or places will not match
-#if [ -f doc/Makefile ]; then
-#  pushd doc > /dev/null
-#  make
-#  popd > /dev/null
-#fi
+rm -f cvsbp-prepare

diff --git a/debian/rules b/debian/rules
index b9e77184bc2703317e0c9deb3f17c055d8350b1f..00d477f8020ec12d6a09ad549853d295bc40dd7a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,7 @@ build-stamp: configure-stamp
        dh_testdir
 
        # Add here commands to compile the package.
-       # $(MAKE) doc
+       $(MAKE) doc
 
        touch build-stamp
 

diff --git a/make-dist.sh b/make-dist.sh
index 1013cab4511b497d39dabfcc4e4201d5c579f972..9e002cd30f60101cc7ee4cbaa3cab5a9c9949d39 100755 (executable)
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -99,7 +99,7 @@ if [ -z ${opt_cvs_buildpackage} ]; then
   cd ..
 else
   cd ${TOPDIR}
-  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC ${DEBPKG}
+  cvs-buildpackage -rfakeroot -kkevin@rosenberg.net -H${TOPDIR}/cvsbp-prepare -tC -i\*.pdf ${DEBPKG}
   cd ..
 fi