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

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Changes by:     Yavor Doganov <yavor>   09/05/27 18:13:14

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

Log message:
        Fix unintentional regression in `msgmerge --previous' behavior.
        * GNUmakefile ($(template-dir)/po/whatsnew.%.html)
        ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): Pass
        `--previous' to `msgmerge'.
        * NEWS: Add as a new bugfix entry.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&r1=1.152&r2=1.153
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile?cvsroot=trans-coord&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/NEWS?cvsroot=trans-coord&r1=1.14&r2=1.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -b -r1.152 -r1.153
--- ChangeLog   25 May 2009 13:55:20 -0000      1.152
+++ ChangeLog   27 May 2009 18:13:13 -0000      1.153
@@ -1,3 +1,11 @@
+2009-05-27  Yavor Doganov  <address@hidden>
+
+       Fix unintentional regression in `msgmerge --previous' behavior.
+       * GNUmakefile ($(template-dir)/po/whatsnew.%.html)
+       ($(rootdir)/home.$(1).shtml, $(subst /po/,/,$(1).html)): Pass
+       `--previous' to `msgmerge'.
+       * NEWS: Add as a new bugfix entry.
+
 2009-05-25  Yavor Doganov  <address@hidden>
 
        Add support for GNU Bzr repositories.

Index: GNUmakefile
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- GNUmakefile 19 May 2009 22:02:51 -0000      1.67
+++ GNUmakefile 27 May 2009 18:13:13 -0000      1.68
@@ -371,7 +371,7 @@
          || (touch $(template-dir)/$(@F) ; \
             $(CVSSKIP) $(CVS) add $(template-dir)/$(@F))
 # Unconditionally update the PO file; see the comment in `article-rules'.
-       $(MSGMERGE) --update $(template-dir)/po/whatsnew.$*.po \
+       $(MSGMERGE) --update --previous $(template-dir)/po/whatsnew.$*.po \
          $(template-dir)/po/whatsnew.pot
        PO=$(template-dir)/po/whatsnew.$*.po \
          OUT=$(template-dir)/po/whatsnew.$*.m4 ; $(PO4A_TRANSLATE) \
@@ -430,7 +430,8 @@
        PO=$(rootdir)/po/home.$(1).po ; $(check-po) || (touch $$$$PO ; exit 1)
        $$(addfile)
 # Unconditionally update the PO file; see the comment in `article-rules'.
-       $(MSGMERGE) --update $(rootdir)/po/home.$(1).po $(rootdir)/po/home.pot
+       $(MSGMERGE) --update --previous $(rootdir)/po/home.$(1).po \
+         $(rootdir)/po/home.pot
        $$(fixperm)
        PO=$(rootdir)/po/home.$(1).po OUT=$(rootdir)/po/home.$(1).m4 ; \
          $(generate-html)
@@ -507,7 +508,7 @@
 # translations has English strings (but no fuzzy strings in the PO)
 # since there's no match between msgid/msgstr.  Invoke msgmerge
 # unconditionally to cope with that (valid) scenario.
-       $(MSGMERGE) --update $(1).po $(basename $(1)).pot
+       $(MSGMERGE) --update --previous $(1).po $(basename $(1)).pot
 # This is needed for only a few articles, but as it is harmless there
 # is no real need to determine them and run the command conditionally.
        $$(fixperm)

Index: NEWS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/NEWS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NEWS        25 May 2009 13:55:20 -0000      1.14
+++ NEWS        27 May 2009 18:13:13 -0000      1.15
@@ -4,6 +4,14 @@
 
 ** GNUmakefile.team supports GNU Bzr repositories.
 
+** Bugs fixed in 0.4.
+
+*** Fix unintentional regression in `msgmerge --previous' behavior.
+    The announced functionality in 0.3 about `previous' strings was
+    not functioning properly, since the `msgmerge' modifications were
+    overwritten by another invocation in all the rules, intended to
+    fix an unrelated bug.
+
 * Changes in GNUnited Nations 0.3 (2009-05-24)
 
 ** GNU gettext >= 0.16 is required for `msgmerge --previous' support.