trans-coord/gnun/server/gnun ChangeLog GNUmakef... [sr-hr]

[Yavor Doganov]

CVSROOT:        /sources/trans-coord
Module name:    trans-coord
Branch:         sr-hr
Changes by:     Yavor Doganov <yavor>   09/12/20 17:26:21

Modified files:
        gnun/server/gnun: ChangeLog GNUmakefile.team THANKS 
        gnun/server/gnun/doc: gnun.texi 

Log message:
        Fix failure in the team makefile when a POT is deleted.
        * GNUmakefile.team (sync): For each file to sync, check if the
        .pot exists and print a warning instead of performing msgmerge.
        * doc/gnun.texi (GNUmakefile.team Variables): Elaborate about the
        new behavior of `sync'.
        * THANKS: Update.
        Reported by Ali Servet Dönmez.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/ChangeLog?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.157.2.12&r2=1.157.2.13
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/GNUmakefile.team?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.6.2.1&r2=1.6.2.2
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/THANKS?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.2&r2=1.2.2.1
http://cvs.savannah.gnu.org/viewcvs/trans-coord/gnun/server/gnun/doc/gnun.texi?cvsroot=trans-coord&only_with_tag=sr-hr&r1=1.9.2.5&r2=1.9.2.6

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/ChangeLog,v
retrieving revision 1.157.2.12
retrieving revision 1.157.2.13
diff -u -b -r1.157.2.12 -r1.157.2.13
--- ChangeLog   21 Nov 2009 08:59:29 -0000      1.157.2.12
+++ ChangeLog   20 Dec 2009 17:26:21 -0000      1.157.2.13
@@ -1,3 +1,13 @@
+2009-12-17  Yavor Doganov  <address@hidden>
+
+       Fix failure in the team makefile when a POT is deleted.
+       * GNUmakefile.team (sync): For each file to sync, check if the
+       .pot exists and print a warning instead of performing msgmerge.
+       * doc/gnun.texi (GNUmakefile.team Variables): Elaborate about the
+       new behavior of `sync'.
+       * THANKS: Update.
+       Reported by Ali Servet Dönmez.
+
 2009-11-11  Yavor Doganov  <address@hidden>
 
        Release 0.4.

Index: GNUmakefile.team
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/GNUmakefile.team,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- GNUmakefile.team    6 Aug 2009 16:04:07 -0000       1.6.2.1
+++ GNUmakefile.team    20 Dec 2009 17:26:21 -0000      1.6.2.2
@@ -114,10 +114,15 @@
 # Synchronize (update) the PO files from the master POTs.
 .PHONY: sync
 sync: update
-       @for file in $(translations) ; do \
-         $(ECHO) $(MSGMERGE) $(MSGMERGEVERBOSE) --quiet --update --previous \
-           $$file \
+       @for file in $(translations); do \
+         if [ ! -f $(wwwdir)`dirname $$file`/po/`basename \
+           $${file/.$(TEAM).po/.pot}` ]; then \
+           echo "Warning: $(notdir $$file) has no equivalent .pot in www."; \
+         else \
+           $(ECHO) $(MSGMERGE) $(MSGMERGEVERBOSE) --quiet --update \
+           --previous $$file \
            $(wwwdir)`dirname $$file`/po/`basename $${file/.$(TEAM).po/.pot}`; \
+         fi; \
        done
 ifeq ($(VCS),yes)
 ifeq ($(REPO),CVS)

Index: THANKS
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/THANKS,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -b -r1.2 -r1.2.2.1
--- THANKS      19 May 2009 22:02:51 -0000      1.2
+++ THANKS      20 Dec 2009 17:26:21 -0000      1.2.2.1
@@ -1,15 +1,17 @@
 Several people have reported bugs and/or provided useful suggestions
 and ideas.  Many thanks for their contributions:
 
-+---------------+-----------------+
-|Andrea Pescetti| address@hidden|
-+---------------+-----------------+
-|Dominik Smatana|   address@hidden|
-+---------------+-----------------+
++------------------+-----------------+
+|Ali Servet Dönmez |   address@hidden|
++------------------+-----------------+
+|Andrea Pescetti   | address@hidden|
++------------------+-----------------+
+|Dominik Smatana   |   address@hidden|
++------------------+-----------------+
 |Hossam Hossny  |   address@hidden|
-+---------------+-----------------+
++------------------+-----------------+
 
-;; Local Variables:
-;; mode: text
-;; coding: utf-8
-;; End:
+Local Variables:
+mode: text
+coding: utf-8
+End:

Index: doc/gnun.texi
===================================================================
RCS file: /sources/trans-coord/trans-coord/gnun/server/gnun/doc/gnun.texi,v
retrieving revision 1.9.2.5
retrieving revision 1.9.2.6
diff -u -b -r1.9.2.5 -r1.9.2.6
--- doc/gnun.texi       21 Nov 2009 08:59:29 -0000      1.9.2.5
+++ doc/gnun.texi       20 Dec 2009 17:26:21 -0000      1.9.2.6
@@ -1479,7 +1479,11 @@
 Updates the repositories.  Does nothing unless @code{VCS=yes}.
 
 @item sync
-Merges all available PO files from the corresponding POT in `www'.
+Merges all available PO files from the corresponding POT in @defn{www}.
+If a POT is missing in the master repository (usually, because it was
+deleted when the original article was either split, renamed or deleted),
+a warning is printed for the corresponding file and no merging occurs
+for it.
 
 @item report
 Verifies which translations are complete, and prints a list (with