trans-coord/gnun/server/gnun ChangeLog GNUmakef...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       14/06/27 16:53:27

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile NEWS 

Log message:
        * GNUmakefile (mark-outdated): Insert SSI variables correctly (broken
        since 2014-04-28).
        * NEWS: Update.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.417&r2=1.418
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.182&r2=1.183
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.109&r2=1.110

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.417
retrieving revision 1.418
diff -u -b -r1.417 -r1.418
--- ChangeLog   27 Jun 2014 16:05:04 -0000      1.417
+++ ChangeLog   27 Jun 2014 16:53:27 -0000      1.418
@@ -1,3 +1,9 @@
+2014-06-28  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile (mark-outdated): Insert SSI variables
+       correctly (broken since 2014-04-28).
+       * NEWS: Update.
+
 2014-06-27  Pavel Kharitonov  <address@hidden>
 
        Documentation updates.
@@ -23,7 +29,7 @@
 
        * diff-po.awk.in: Make it work with awks that don't
        recognize the `[:space:]' character class.
-       * NEWS: Update.
+       * NEWS:
        * TODO: Update.
 
 2014-05-22  Pavel Kharitonov  <address@hidden>

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -b -r1.182 -r1.183
--- GNUmakefile 11 May 2014 14:53:00 -0000      1.182
+++ GNUmakefile 27 Jun 2014 16:53:27 -0000      1.183
@@ -537,16 +537,17 @@
  , diff_file=""; \
  ) \
 $(SED) --in-place \
-'/^<!--#set var="PO_FILE"/,/<!--#set var="OUTDATED_SINCE"/d;\
+'/^<!--#set var="PO_FILE"/,/<!--#set var="OUTDATED_SINCE"/{\
+  s/^<!--#set var="PO_FILE".*/ /;tskip;d;:skip;};\
  /<!--#include virtual="\/server\/outdated/d;\
- 1s%^%<!--#set var="PO_FILE"\n\
+ 1s%^[[:space:]]*%<!--#set var="PO_FILE"\n\
     value='"'<a href=\"$$$${PO#$(rootdir)}\">\n\
            http://www.gnu.org$$$${PO#$(rootdir)}</a>'"'\n \
  --><!--#set var="ORIGINAL_FILE" value="'"$$$${original#$(rootdir)}"'"\n\
  --><!--#set var="DIFF_FILE" value="'"$$$${diff_file#$(rootdir)}"'"\n\
  --><!--#set var="OUTDATED_SINCE"\
  value="'"`$(call extract-outdated-date,$$$$PO) | $(SED) 's/ .*//'`"'"\
- -->\n%;\
+ -->%;\
  /^[[:space:]]*<!--'"$$$${marker}"'/a\
 <!--#include virtual="/server/outdated.$(2).html" -->' $(1) \
  || true; \

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -b -r1.109 -r1.110
--- NEWS        17 Jun 2014 15:12:17 -0000      1.109
+++ NEWS        27 Jun 2014 16:53:27 -0000      1.110
@@ -9,6 +9,9 @@
 *** `gnun-diff-po' didn't work with awks that don't
     recognize the `[:space:]' class in their regular expressions.
 
+*** GNUmakefile didn't insert SSI variables for outdated notices
+    correctly.
+
 * Changes in GNUnited Nations 0.9 (2014-05-22)
 
 ** Apache variables are inserted at the beginning of the generated