X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;h=d974a75d6ad5bc0f63a815002953321375ef72d7;hb=45eaeadd2ec8aa40dbe794cd6f4b31027a84aa4e;hp=823d4b03b3fec26893e8602ce029c8408e75966b;hpb=0e305a6bd11df323b21c77f16159ef365b6846ff;p=ctsim.git

diff --git a/make-dist.sh b/make-dist.sh
index 823d4b0..d974a75 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -5,9 +5,10 @@
 
 set -e
 
-VERSION=`cat VERSION`
 DEBPKG=ctsim
 PKG=ctsim
+VERSION=`sed -n -e "s/${DEBPKG} (\(.*\)-[0-9]).*/\1/p" < debian/changelog  |head -1`
+echo $VERSION
 TOPDIR=`basename $PWD`
 
 DISTDIR=${PKG}-${VERSION}
@@ -29,36 +30,44 @@ cp -a ${TOPDIR} ${DISTDIR}
 # Remove junk from distribution dir
 find ${DISTDIR} -type f -name .cvsignore -exec rm {} \;
 find ${DISTDIR} -type d -name CVS | xargs rm -r
-find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
-    -name \*.log -or -name \*.out -or -name \*.dvi -or \
-    -name \*~ -or -name .\#\*  -or -name \#*\# |xargs rm -f
+find ${DISTDIR}/doc -type f -and -name *.tex -or -name *.aux -or \
+    -name *.log -or -name *.out -or -name *.dvi -or \
+    -name *~ -or -name ".#*"  -or -name "#*#" |xargs rm -f
 
 # Create original distribution archives
 rm -rf ${DISTDIR}/debian
+cd ${DISTDIR}
+make distclean
+cd ..
 GZIP=-9 tar czf ${DISTDIR}.tar.gz ${DISTDIR}
 
-cp -a ${DISTDIR} ${DEBDIR}
-GZIP=-9 tar czf ${DEBPKG}_${VERSION}.orig.tar.gz ${DEBDIR}
-
-find ${DISTDIR} -type f -and -name \*.cl -or -name \*.list -or \
-    -name \*.system -or -name Makefile -or -name ChangeLog -or \
+find ${DISTDIR} -type f -and -name *.c -or -name *.h -or -name *.list -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 \
+    -or -name NEWS -or -name *.sgml -or -name COPYING* -or -name catalog \
     | xargs unix2dos
 zip -rq ${DISTDIR}.zip ${DISTDIR}
 
+rm -rf ${DISTDIR}
+
+tar xzf ${DISTDIR}.tar.gz 
+cp ${DISTDIR}.tar.gz ${DEBPKG}_${VERSION}.orig.tar.gz
+
+if [ "${DISTDIR}" != "${DEBDIR}" ]; then
+  mv ${DISTDIR} ${DEBDIR}
+fi
 cp -a ${TOPDIR}/debian ${DEBDIR}
 
-cd ${DEBDIR}
-dpkg-buildpackage -rfakeroot -kkevin@b9.com -a
+# dpkg-source ${DEBDIR} ${PKG}_${VERSION}.orig.tar.gz
 
+cd ${DEBDIR}
+dpkg-buildpackage -rfakeroot -kkevin@b9.com  #-tc -b
 cd ..
-rm -rf ${DEBDIR}
-rm -rf ${DISTDIR}
+
 
 lintian ${DEBPKG}_${VERSION}-*.changes
 
 mkdir -p /usr/local/share/Packages/${DEBPKG}
-mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
+# mv ${DEBPKG}_${VERSION}* /usr/local/share/Packages/${DEBPKG}
 cd ${TOPDIR}
 exit 0