[Po4a-commits] "po4a NEWS, 1.40, 1.41 changelog, 1.277, 1.278 po4a, 1.78, 1.79"

[Nicolas FRANCOIS]

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

Modified Files:
	NEWS changelog po4a 
Log Message:
Replace ${%$hashref}{key} constructs by
$hashref->{key}.  This fix failures with perl 5.10. Thanks to
Roderich Schupp <roderich.schupp at googlemail.com> for the patch.
Fix debian bug #459451.


Index: NEWS
===================================================================
RCS file: /cvsroot/po4a/po4a/NEWS,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- NEWS	12 Jan 2008 22:56:30 -0000	1.40
+++ NEWS	13 Jan 2008 15:21:16 -0000	1.41
@@ -26,6 +26,9 @@
   xml: New option "cpp" to support C preprocessor directives (this avoids
        re-wrapping lines with preprocessor directives).
 
+  po4a: Fix failures with perl 5.10. Thanks to Roderich Schupp
+        <roderich.schupp at googlemail.com>
+
 ===============================================================================
 * Major changes in release 0.32 (2007-08-15)
 

Index: po4a
===================================================================
RCS file: /cvsroot/po4a/po4a/po4a,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- po4a	2 Jul 2007 22:55:21 -0000	1.78
+++ po4a	13 Jan 2008 15:21:16 -0000	1.79
@@ -440,10 +440,10 @@
     $opts{"msgmerge-opt"} .= " --previous" if $previous;
 
     # options to transmit to the modules
-    %{$opts{"options"}} = (
+    $opts{"options"} = {
         "verbose" => $opts{"verbose"},
         "debug"   => $opts{"debug"}
-    );
+    };
     foreach (@options) {
         if (m/^([^=]*)=(.*)$/) {
             $opts{"options"}{$1}="$2";
@@ -498,10 +498,10 @@
             if (! defined $lang) {
                 $lang = "global";
             }
-            if (! defined ${%$options}{$lang}) {
-                ${%$options}{$lang} = $opt;
+            if (! defined $options->{$lang}) {
+                $options->{$lang} = $opt;
             } else {
-                ${%$options}{$lang} .= " $opt";
+                $options->{$lang} .= " $opt";
             }
         } else {
             last;
@@ -638,20 +638,20 @@
 	my %options;
 	# 1. Use the global options ([opt] ...)
 	%options = %{$document{''}{'options'}}
-	  if defined %{$document{''}{'options'}};
+	  if defined $document{''}{'options'};
 
 	# 2. Merge the alias options
 	if (defined $aliases{$1}) {
 	    $document{$main}{'format'} = $aliases{$1}{"module"};
-	    if (defined %{$aliases{$1}{"options"}}) {
-		%options = %{$aliases{$1}{"options"}};
+	    if (defined $aliases{$1}{"options"}) {
+		%options = %{$aliases{$1}{"options"}}; # XXX not a merge, but overwrite
 	    }
 	}
 
 	# 3. If this file was already specified, reuse the previous
 	#    options (no merge)
 	%options = %{$document{$main}{'options'}}
-	  if defined %{$document{$main}{'options'}};
+	  if defined $document{$main}{'options'};
 
 	# 4. Merge the document specific options
 	# separate the end of the line, which contains options.
@@ -697,7 +697,7 @@
 	$o =~ s/.*?\[options\] +//;
 	parse_config_options("$config_file:$nb",
 	                     $o,
-	                     \%{$document{''}{"options"}});
+	                     $document{''}{"options"});
     } else {
 	die wrap_ref_mod("$config_file:$nb", "",
 	    gettext("Unparsable command '%s'."), $cmd);

Index: changelog
===================================================================
RCS file: /cvsroot/po4a/po4a/changelog,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- changelog	13 Jan 2008 13:55:15 -0000	1.277
+++ changelog	13 Jan 2008 15:21:16 -0000	1.278
@@ -1,5 +1,11 @@
 2008-01-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* NEWS, po4a: Replace ${%$hashref}{key} constructs by
+	$hashref->{key}.  This fix failures with perl 5.10. Thanks to
+	Roderich Schupp <roderich.schupp at googlemail.com> for the patch.
+
+2008-01-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* t/05-config.t, t/24-tex.t: Ignore the number of dots before
 	"done". The output of msgmerge is not reliable with gettext 0.17.