X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=make-dist.sh;fp=make-dist.sh;h=72875c46642e5f342a495df07e99c5ddec724d7f;hb=26c182a47734467abd8658d51d125ada642e0639;hp=9dbc73bfdebba660550816936c22e301de5579fc;hpb=aa269788e108d3b8861aad5cb5a7b28278677cdf;p=uffi.git

diff --git a/make-dist.sh b/make-dist.sh
index 9dbc73b..72875c4 100755
--- a/make-dist.sh
+++ b/make-dist.sh
@@ -10,7 +10,7 @@ TOPDIR=`basename $PWD`
 
 VERSION=`cat VERSION`
 DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog  |head -1`
-
+PACKAGE_DIR=/usr/local/src/Packages/${DEBPKG}
 DISTDIR=${PKG}-${VERSION}
 DEBDIR=${DEBPKG}-${VERSION}
 
@@ -61,23 +61,22 @@ rm -rf ${DEBDIR}/debian/CVS
 rm -rf ${DISTDIR}
 
 export CVS_BUILDPACKAGE=1
-if [ "${CVS_BUILDPACKAGE}" != "" ]; then
-  rm -rf ${DEBDIR}
-  mv ${DEBPKG}_${VERSION}.orig.tar.gz /usr/local/src/Packages/${DEBPKG}
-else
+if [ "${CVS_BUILDPACKAGE}" == "" ]; then
   cd ${DEBDIR}
   echo "Building Debian files"
   dpkg-buildpackage -rfakeroot -kkevin@rosenberg.net -a
   echo "Checking Debian Files"
   lintian ${DEBPKG}_${VERSION}-*.changes
-
-  echo "Moving Debian Files to /usr/local/src/Packages/${DEBPKG}"
-  mkdir -p /usr/local/src/Packages/${DEBPKG}
-  mv ${DEBPKG}_${VERSION}* /usr/local/src/Packages/${DEBPKG}
   cd ..
-  rm -rf ${DEBDIR}
 fi
 
+echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
+kdir -p /usr/local/src/Packages/${DEBPKG}
+mv ${DEBPKG}_${VERSION}* ${PACKAGE_DIR}
+rm -rf ${DEBDIR}
+mv ${DISTDIR}.zip ${PACKAGE_DIR}
+mv ${DISTDIR}.tar.gz ${PACKAGE_DIR}
+
 cd ${TOPDIR}
 
 exit 0