trans-coord/gnun/server/gnun GNUmakefile.team N...

[Pavel Kharitonov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Pavel Kharitonov <ineiev>       13/03/21 04:25:51

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

Log message:
        (cmp-POs): Rewrap lines before comparing the files;
        qualify non-significant differences more adequately.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.364&r2=1.365

Patches:
Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- GNUmakefile.team    14 Jan 2013 19:40:15 -0000      1.31
+++ GNUmakefile.team    21 Mar 2013 04:25:44 -0000      1.32
@@ -234,15 +234,14 @@
 endif
 endif
 
-# The command to compare PO files; comments and dates are generally
-# considered insignificant.  The msgfmt output is compared
-# in order to take into account the case when they only differ
-# by the `fuzzy' flags (present in one file, cleared in the other).
+# The command to compare PO files; "extracted" comments (including
+# `# type: ...'), old messages, dates are considered insignificant.
 define cmp-POs
-diff -q -I "^$$" -I "^#" -I '^"POT-Creation-Date:' \
-  -I '^"PO-Revision-Date:' -I '^"Outdated-Since:' &>/dev/null $1 $2 \
-  && test "x`$(MSGFMT) -o /dev/null --statistics $1 2>&1`" \
-     = "x`$(MSGFMT) -o /dev/null --statistics $2 2>&1`"
+{ $(MSGATTRIB) --no-obsolete --force-po -w 79 -o $1.tmp.po $1; \
+  $(MSGATTRIB) --no-obsolete --force-po -w 79 $2 \
+  | diff -q -I "^$$" -I "^#\. " -I "^# type: " -I '^"POT-Creation-Date:' \
+    -I '^"PO-Revision-Date:' -I '^"Outdated-Since:' $1.tmp.po - &>/dev/null; \
+  status=$$?; rm $1.tmp.po; test $$status = 0; }
 endef
 
 # Merge a file.

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- NEWS        31 Jan 2013 07:22:25 -0000      1.83
+++ NEWS        21 Mar 2013 04:25:50 -0000      1.84
@@ -20,6 +20,9 @@
 *** The optional templates were not taken into account
     in GNUmakefile.team.
 
+*** The difference detection for PO files was improved
+    in GNUmakefile.team.
+
 * Changes in GNUnited Nations 0.7 (2012-12-27)
 
 ** GNUmakefile.team enhancements:

Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -b -r1.364 -r1.365
--- ChangeLog   14 Mar 2013 06:56:04 -0000      1.364
+++ ChangeLog   21 Mar 2013 04:25:51 -0000      1.365
@@ -1,3 +1,10 @@
+2013-03-20  Pavel Kharitonov  <address@hidden>
+
+       * GNUmakefile.team (cmp-POs): Rewrap lines before
+       comparing the files; qualify non-significant differences
+       more adequately.  (On report by Joerg Kohne on bug-gnun).
+       * NEWS: Update.
+
 2013-03-14  Pavel Kharitonov  <address@hidden>
 
        * GNUmakefile (generate-translinks): Specify `lang' and