projects
/
uffi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r1919: *** empty log message ***
[uffi.git]
/
make-dist.sh
diff --git
a/make-dist.sh
b/make-dist.sh
index 22acd2bf0e21a69ccb59cebc426e942bf7adedda..8d57aeab5ec064fe580439f3f0889d326e8e76aa 100755
(executable)
--- a/
make-dist.sh
+++ b/
make-dist.sh
@@
-10,19
+10,19
@@
TOPDIR=`basename $PWD`
VERSION=`cat VERSION`
DEBVERSION=`sed -n -e "s/${DEBPKG} (\(.*\)).*/\1/p" < debian/changelog |head -1`
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}
DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
DISTDIR=${PKG}-${VERSION}
DEBDIR=${DEBPKG}-${VERSION}
DEB_TAG=debian_version_`echo ${DEBVERSION} | tr . _`
UPSTREAM_TAG=upstream_version_`echo ${VERSION} | tr . _`
-echo "(Re
)tagging with d
ebian tag '${DEB_TAG}'"
-cvs -q rtag -d $
TAG $PKG
> /dev/null
-cvs -q tag -F $
TAG
> /dev/null
+echo "(Re
-)tagging with D
ebian tag '${DEB_TAG}'"
+cvs -q rtag -d $
{DEB_TAG} ${PKG}
> /dev/null
+cvs -q tag -F $
{DEB_TAG}
> /dev/null
# Retag with upstream tag if release not 0 or 1
if [ "`echo ${DEBVERSION} | egrep '\-0$\-1$]'`" != "" ]; then
# Retag with upstream tag if release not 0 or 1
if [ "`echo ${DEBVERSION} | egrep '\-0$\-1$]'`" != "" ]; then
- echo "(Re
)tagging with u
pstream tag '${UPSTREAM_TAG}'"
+ echo "(Re
-)tagging with U
pstream tag '${UPSTREAM_TAG}'"
cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
cvs -q tag -F $UPSTREAM_TAG > /dev/null
fi
cvs -q rtag -d $UPSTREAM_TAG $PKG > /dev/null
cvs -q tag -F $UPSTREAM_TAG > /dev/null
fi
@@
-34,11
+34,12
@@
rm -rf ${DISTDIR} ${DEBDIR} ${DISTDIR}.zip
cp -a ${TOPDIR} ${DISTDIR}
echo "Cleaning distribution directory ${DISTDIR}"
cp -a ${TOPDIR} ${DISTDIR}
echo "Cleaning distribution directory ${DISTDIR}"
-find ${DISTDIR} -type f -name .cvsignore -exec rm -f {} \;
+rm -f ${DISTDIR}/upload.sh
+rm -f `find ${DISTDIR} -type f -name .cvsignore`
rm -rf `find ${DISTDIR} -type d -name CVS`
rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*' -or -name '#*#'`
rm -f `find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
rm -rf `find ${DISTDIR} -type d -name CVS`
rm -f `find ${DISTDIR} -type f -name '*~' -or -name '#*' -or -name '#*#'`
rm -f `find ${DISTDIR}/doc -type f -name \*.tex -or -name \*.aux -or \
- -name \*.log -or -name \*.out -or -name \*.dvi
-or -name bp
`
+ -name \*.log -or -name \*.out -or -name \*.dvi`
echo "Creating upstream archives"
rm -rf ${DISTDIR}/debian
echo "Creating upstream archives"
rm -rf ${DISTDIR}/debian
@@
-60,23
+61,22
@@
rm -rf ${DEBDIR}/debian/CVS
rm -rf ${DISTDIR}
export CVS_BUILDPACKAGE=1
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
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 ..
cd ..
- rm -rf ${DEBDIR}
fi
fi
+echo "Moving Upstream and Debian Files to ${PACKAGE_DIR}"
+mkdir -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
cd ${TOPDIR}
exit 0