www rss/Makefile server/whatsnew.txt

[Yavor Doganov]

CVSROOT:        /web/www
Module name:    www
Changes by:     Yavor Doganov <yavor>   08/01/12 19:13:28

Modified files:
        rss            : Makefile 
        server         : whatsnew.txt 

Log message:
        Another (pathetic) attempt to resotore the normal operation of GNU's
        Flashes.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/rss/Makefile?cvsroot=www&r1=1.52&r2=1.53
http://web.cvs.savannah.gnu.org/viewcvs/www/server/whatsnew.txt?cvsroot=www&r1=1.103&r2=1.104

Patches:
Index: rss/Makefile
===================================================================
RCS file: /web/www/www/rss/Makefile,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- rss/Makefile        12 Jan 2008 18:27:29 -0000      1.52
+++ rss/Makefile        12 Jan 2008 19:13:19 -0000      1.53
@@ -88,7 +88,9 @@
        cvs $(CVSOPTS) ci -m "automatic update of the whatsnew.html" $@
 
 ../gnusflashes.include: ../server/whatsnew.txt
-       cvs -q update $@
+# Safeguard for manual edits of the target: delete and restore it
+# since merely updating it is likely to result in conflicts.
+       $(RM) $@ ; cvs -q update $@
        gawk -f ../server/news-to-xml.awk $< | xsltproc ../gnusflashes.xslt - > 
$@
        cvs $(CVSOPTS) ci -m "automatic update of the GNUs flashes" $@
 

Index: server/whatsnew.txt
===================================================================
RCS file: /web/www/www/server/whatsnew.txt,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -b -r1.103 -r1.104
--- server/whatsnew.txt 12 Jan 2008 18:30:53 -0000      1.103
+++ server/whatsnew.txt 12 Jan 2008 19:13:23 -0000      1.104
@@ -1,6 +1,8 @@
 * 20 December 2007
 
-Celebrate <a href="http://gnupg.org";>GnuPG</a>'s <a 
href="http://lists.gnu.org/archive/html/info-gnu/2007-12/msg00009.html";>10th 
birthday</a>!
+Celebrate <a href="http://gnupg.org";>GnuPG</a>'s <a
+href="http://lists.gnu.org/archive/html/info-gnu/2007-12/msg00009.html";>10th
+birthday</a>!
 
 * 25 November 2007