r1928: *** empty log message ***

diff --git a/cvsbp-prepare b/cvsbp-prepare
index cd9155b844c54320b0adc384bb6748c429b0138f..4c327702094b2bbc48a4f7a264a465fb902d76f4 100755 (executable)
--- a/cvsbp-prepare
+++ b/cvsbp-prepare
@@ -1,9 +1,5 @@
 #!/bin/bash
 
-# Clean checked out CVS directory
-rm -f upload.sh make-dist.sh make-doc.sh cvsbp-prepare
-rm -f `find . -type f -name .cvsignore`
-
 # Try to copy documentation from Work dir
 CWD=`pwd`
 BASENAME=`basename ${CWD}`
@@ -12,10 +8,15 @@ DOCDIR=/usr/local/src/Work/${BASEDIR}/doc
 
 if [ -d ${DOCDIR} -a -d doc ]; then
   echo "Copying documentation"
-  cp -a ${DOCDIR}/html ${DOCDIR}/*pdf doc/.
-  echo "Unable to copy 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 `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

diff --git a/debian/changelog b/debian/changelog
index 029424e3e478bec5e30192307b863ab225a7ed98..e99e8f6a3e293818aad82588275aa4a20e0e71cd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 cl-uffi (0.4.4-7) unstable; urgency=low
 
-  * Modified make-dist.sh to use cvs-buildpackage.
+  * Modified make-dist.sh to use cvs-buildpackage, added options
+  * Cleaned debian/rules       
   * First version to upload. (closes: #145723)
 
  -- Kevin Rosenberg <kevin@cheetah-debian.med-info.com>  Sat,  4 May 2002 16:03:11 -0600

diff --git a/debian/rules b/debian/rules
index c6900c925873d3b38672db61f30eacdc86a0e1b8..0cc923211f7dcd3e9f7496039c85a7203e27c137 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,16 +8,17 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
-pkg    := cl-uffi
-prefix := debian/$(pkg)
+pkg    := uffi
+debpkg  := cl-uffi
+prefix := debian/$(debpkg)
 
 INSTALL        := install
 INSTALLFLAGS   := -g root -o root -m 0644
 INSTALLDIRFLAGS        := -d -g root -o root -m 0755
 
 SOURCEDIR      := $(prefix)/usr/share/common-lisp/source
-REPOSITORYDIR  := $(prefix)/usr/share/common-lisp/repositories/uffi
-DOCDIR         := $(prefix)/usr/share/doc/cl-uffi
+REPOSITORYDIR  := $(prefix)/usr/share/common-lisp/repositories/${pkg}
+DOCDIR         := $(prefix)/usr/share/doc/${debpkg}
 
 
 configure: configure-stamp