From 2ff1a6bc00f45761207e092b00075ce6194005e1 Mon Sep 17 00:00:00 2001
From: Jan Kneschke <jan@kneschke.de>
Date: Wed, 2 Mar 2005 18:37:16 +0000
Subject: [PATCH] don't put download URLs in release-text for the web

git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@80 152afb58-edef-0310-8abb-c4023f1b3aa9
---
 distribute.sh.in | 38 ++++++++++++--------------------------
 1 file changed, 12 insertions(+), 26 deletions(-)

diff --git a/distribute.sh.in b/distribute.sh.in
index 8db25094..693536a4 100644
--- a/distribute.sh.in
+++ b/distribute.sh.in
@@ -4,8 +4,7 @@ VERSION=@VERSION@
 NAME=@PACKAGE_TARNAME@-@VERSION@
 
 DISTDIR="/home/weigon/wwwroot/servers/www.lighttpd.net/pages/download/" 
-FILES="content-3 content-4 content-5 \
-	/usr/src/packages/RPMS/i586/${NAME}-1.i586.rpm \
+FILES="/usr/src/packages/RPMS/i586/${NAME}-1.i586.rpm \
 	/usr/src/packages/SRPMS/${NAME}-1.src.rpm \
 	${NAME}.tar.gz \
 	NEWS.html \
@@ -34,24 +33,7 @@ DATE=`date +'%Y-%m-%d %H:%M'`
 NEWS=`cat NEWS | sed "/^- ${VERSION}/,/^-/p;d" | sed "/^- /d;/^$/d"`
 DLNAME="${DLURL}/${NAME}"
 
-cat > release-news.${VERSION} <<EOF
-!${PACKAGE} ${VERSION} - ${DATE}
-- *Changes*
-++QUOTED++
-<pre>${NEWS}
-</pre><br />
---QUOTED--
-- *Download*
-- (${NAME}-1.i586.rpm|${NAME}-1.i586.rpm) [built on SuSE 9.0]
-  MD5: ${MD5RPM}
-- (${NAME}-1.src.rpm|${NAME}-1.src.rpm)
-  MD5: ${MD5SRPM}
-- (${NAME}.tar.gz|${NAME}.tar.gz)
-  MD5: ${MD5TGZ} (${NAME}.tar.gz.sig|signature)
-
-EOF
-
-cat > release-news.${VERSION}.txt <<EOF
+cat > release-news.${VERSION}-mail.txt <<EOF
 ${PACKAGE} ${VERSION} - ${DATE}
 
 Changes
@@ -72,12 +54,16 @@ Download
 
 EOF
 
-rst2html.py NEWS > NEWS.html
+cat > release-news.${VERSION}.txt <<EOF
+${PACKAGE} ${VERSION} - ${DATE}
+
+Changes
+-------
+${NEWS}
+
+EOF
 
-cat content-4.foot | sed "/^\!${PACKAGE} ${VERSION}/,/^$/d" > content-4.foot.new
-cat release-news.${VERSION} content-4.foot.new > content-4.foot
-rm content-4.foot.new
-cat content-4.head content-4.foot > content-4
+rst2html.py NEWS > NEWS.html
 
 for i in ${DISTDIR}; do
 	cp -u ${FILES} $i
@@ -88,5 +74,5 @@ cd ~/wwwroot/servers/www.lighttpd.net/
 make put
 cd ${curdir}
 
-kmail -s "ANNOUNCE: ${NAME}" --msg `pwd`/release-news.${VERSION}.txt lighttpd-announce@lists.kneschke.de
+kmail -s "ANNOUNCE: ${NAME}" --msg `pwd`/release-news.${VERSION}-mail.txt lighttpd-announce@lists.kneschke.de