Integrate the new NEWS file into the release procedure.

3 files changed, 3 insertions, 6 deletions

diff --git a/www/Makefile b/www/Makefile
index 9750a239..1caebff8 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -28,9 +28,6 @@ html: index.html $(XML:.xml=.html)
 index.html: index.html.in
 	sed -e "/@DATE@/s//`date '+%B %d, %Y'`/" <index.html.in >index.html
 
-CHANGES: ../gpsd.spec.in
-	sed <../gpsd.spec.in -e '1,/%changelog/d' >CHANGES
-
 # Re-do this and upload it when adding new manuals
 sums: 
 	sha1sum `find vendor-docs -type f -name "*.pdf" -print` >checksums
diff --git a/www/index.html.in b/www/index.html.in
index 0b398db5..97ddd6b6 100644
--- a/www/index.html.in
+++ b/www/index.html.in
@@ -142,7 +142,7 @@ buying <a href="wishlist.html"> test hardware and standards</a>.</p>
 <h1 id='news'>News</h1>
 
 <p>This web page was last updated on @DATE@.  You can browse the
-project's <a href='CHANGES'>change log</a> or <a href='TODO'>to-do
+project's <a href='NEWS'>news file</a> or <a href='TODO'>to-do
 list</a> here.</p>
 
 <h1 id='downloads'>Downloads and packages</h1>
diff --git a/www/upload b/www/upload
index 434e6a7c..e6f00086 100755
--- a/www/upload
+++ b/www/upload
@@ -5,7 +5,7 @@
 webdir=shell.berlios.de:/home/groups/gpsd/htdocs
 cgidir=shell.berlios.de:/home/groups/gpsd/cgi-bin
 
-make html CHANGES	# Ensure all derived HTML is up to date.
+make html	# Ensure all derived HTML is up to date.
 
 if [ $1 ]
 then
@@ -14,7 +14,7 @@ else
     (cd performance; xmlto xhtml-nochunks performance.xml)
     scp start-kismet *.html *.png *.pdf *.gif *.css *.js *.txt \
 	performance/{*.html,*.txt,*.png} \
-	../TODO CHANGES \
+	../TODO ../NEWS \
 	$webdir
     scp gps_report.cgi $cgidir
 fi