r1971: *** empty log message ***

diff --git a/make-debian.sh b/make-debian.sh
index 778ce0aace2dfc9d0efb376b7191c4e3511b53a4..eb2ca3fd3c39bfab98a3f22e6d43ddf8a4098fd7 100755 (executable)
--- a/make-debian.sh
+++ b/make-debian.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEBPKG=cl-uffi
+DEBPKG=ctsim
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
 TOPDIR=`pwd`
 PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}

diff --git a/make-upstream.sh b/make-upstream.sh
index 1a2a22e068299ce46cbf6a8c989f491f8c426636..6c0e258f7a9f09071428e1fa87e3867c00a940c8 100755 (executable)
--- a/make-upstream.sh
+++ b/make-upstream.sh
@@ -28,8 +28,8 @@ while [ $# != 0 ]; do
     shift
 done
 
-DEBPKG=cl-uffi
-PKG=uffi
+DEBPKG=ctsim
+PKG=ctsim
 TOPDIR=`pwd`
 
 VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9.]).*/\1/p" < debian/changelog  |head -1`
@@ -43,8 +43,15 @@ if [ ! -z ${opt_tag} ]; then
     echo "(Re-)tagging with Upstream tag '${UPSTREAM_TAG}'"
     cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
     cvs -q tag -F $UPSTREAM_TAG > /dev/null
+fi
 
+if [ ! -f docs/${PKG}.htb -o ! -f docs/html/${PKG}_contents.html -o ! -f docs/${PKG}.pdf ]; then
+  echo "Making documentation"
+  pushd doc
+  make all
+  popd
 fi
+
 # Prepare for archive
 cd ..
 rm -f ${PKG}_${VERSION}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
@@ -59,26 +66,39 @@ rm -rf `find . -type d -name CVS`
 rm -f `find . -type f -name '*~' -or -name '.#*'  -or -name '#*#' -or -name ".*~"`
 rm -f `find doc -type f -name \*.tex -or -name \*.aux -or \
   -name \*.log -or -name \*.out -or -name \*.dvi`
+rm -rf images doc stamp-h.in build-stamp configure-stamp autom4te.cache
 cd ..
 
 echo "Creating upstream archives"
 rm -rf ${DISTDIR}/debian
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-cp -a ${DISTDIR} ${DEBDIR}
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
+rm -rf ${DISTDIR}
+if [ "${DISTDIR}" != "${DEBDIR}" ]; then 
+  cp -a ${DISTDIR} ${DEBDIR}
+else
+  cp -a ${DISTDIR} ${DEBDIR}-copy
+fi
 
-unix2dos `find ${DISTDIR} -type f -name \*.cl -or -name \*.list -or \
-    -name \*.system -or -name Makefile -or -name ChangeLog -or \
-    -name COPYRIGHT -or -name TODO -or -name README -or -name INSTALL -or \
-    -name NEWS -or -name \*.sgml -or -name COPYING\* -or -name catalog`
+unix2dos `find ${DISTDIR} -type f -and -name '*.c' -or -name '*.h' -or \
+  -name '*.cpp' -or -name '*.sh' -or -name '*.in' -or \
+  -name 'Makefile*' -or -name ChangeLog -or -name COPYRIGHT -or -name TODO -or \
+  -name README -or -name INSTALL -or -name NEWS -or -name '*.tex' -or \
+  -name '*.hhc' -or -name '*.hhk' -or -name '*.hpj' -or -name '*.ini' -or \
+  -name COPYING* -or -name catalog` 
 zip -rq ${DISTDIR}.zip ${DISTDIR}
+rm -r {$DISTDIR}
+
+if [ "${DISTDIR}" == "${DEBDIR}" ]; then 
+  mv ${DEBDIR}-copy ${DEBDIR}
+fi
+GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
 
 cp -a ${TOPDIR}/debian ${DEBDIR}
 rm -f ${DEBDIR}/debian/.cvsignore 
 rm -rf ${DEBDIR}/debian/CVS
 
-rm -rf ${DISTDIR} ${DEBDIR}
+rm -rf ${DEBDIR}
 
 echo "Moving upstream archives to ${PACKAGE_DIR}"
 mkdir -p /usr/local/src/Packages/${DEBPKG}