[Po4a-commits] "po4a NEWS, 1.17, 1.18 changelog, 1.180, 1.181 po4a, 1.70, 1.71 po4a-updatepo, 1.39, 1.40"

[Nicolas FRANCOIS]

Update of /cvsroot/po4a/po4a
In directory alioth:/tmp/cvs-serv15695

Modified Files:
	NEWS changelog po4a po4a-updatepo 
Log Message:
Use the --previous flag with msgmerge.


Index: NEWS
===================================================================
RCS file: /cvsroot/po4a/po4a/NEWS,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- NEWS	24 Mar 2007 20:49:40 -0000	1.17
+++ NEWS	26 Mar 2007 21:06:47 -0000	1.18
@@ -3,11 +3,21 @@
 ===============================================================================
 * Major changes in release 0.31
 
+** Dependencies
+
+  po4a,
+  po4a-updatepo: msgmerge is called with the --previous switch.
+                 Hence, po4a depends on gettext 0.16.
+                 You can remove this switch in po4a and po4a-updatepo if
+                 this version is not available on your system.
+
 ** Bug fixes
 
   general: Don't hang when running in background with redirected stdout.
            Thanks to Jim Meyering.
 
+** New features
+
   general: Beginning of a C extension. This provides speedup. Testers are
            welcomed.
 

Index: po4a-updatepo
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a-updatepo,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- po4a-updatepo	25 Feb 2006 22:59:21 -0000	1.39
+++ po4a-updatepo	26 Mar 2007 21:06:48 -0000	1.40
@@ -203,7 +203,7 @@
     if (-e $po_filename) {
 	print STDERR wrap_msg(gettext("Updating %s:"), $po_filename)
 	    if $verbose;
-	system ("msgmerge","-U",$po_filename,$pot_filename) == 0
+	system ("msgmerge","--previous","-U",$po_filename,$pot_filename) == 0
 	    or die wrap_msg(gettext("Error while running msgmerge: %s"), $!);
 	system "msgfmt --statistics -v -o /dev/null $po_filename"
 	  if $verbose;

Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- po4a	24 Mar 2007 22:23:17 -0000	1.70
+++ po4a	26 Mar 2007 21:06:47 -0000	1.71
@@ -872,7 +872,7 @@
     if (-e $po_filename{$lang}) {
 	print wrap_msg(gettext("Updating %s:")." ", $po_filename{$lang})
 	    if ($po4a_opts{"verbose"});
-	my $cmd = "msgmerge -U ".$po_filename{$lang}." $pot_filename".
+	my $cmd = "msgmerge --previous -U ".$po_filename{$lang}." $pot_filename".
 	          (($po4a_opts{"no-backups"}||$po4a_opts{"split"})?
 	           " --backup=none":"");
 	run_cmd($cmd);
@@ -921,7 +921,7 @@
 
             # Update the PO according to the new POT and to the big PO
             # (compendium).
-            $cmd = "msgmerge -U -C ".$po_filename{$lang}.
+            $cmd = "msgmerge --previous -U -C ".$po_filename{$lang}.
                    " --backup=none ".$tmp_file." ".$splitted_pot{$master};
             run_cmd($cmd);
 

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.180
retrieving revision 1.181
diff -u -d -r1.180 -r1.181
--- changelog	24 Mar 2007 22:23:17 -0000	1.180
+++ changelog	26 Mar 2007 21:06:47 -0000	1.181
@@ -1,5 +1,10 @@
 2007-03-24  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* po4a, po4a-updatepo: Use msgmerge with the --previous switch.
+	This requires gettext >= 0.16
+
+2007-03-24  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* po4a: In the sort subroutine, the null document can be the first
 	or second argument.