r77399 - in /trunk/libxml-libxml-simple-perl: ChangeLog META.yml Makefile.PL README debian/changelog lib/XML/LibXML/Simple.pm
carnil at users.alioth.debian.org
carnil at users.alioth.debian.org
Tue Jul 12 11:38:36 UTC 2011
Author: carnil
Date: Tue Jul 12 11:38:28 2011
New Revision: 77399
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=77399
Log:
* Team upload.
* New upstream release
Modified:
trunk/libxml-libxml-simple-perl/ChangeLog
trunk/libxml-libxml-simple-perl/META.yml
trunk/libxml-libxml-simple-perl/Makefile.PL
trunk/libxml-libxml-simple-perl/README
trunk/libxml-libxml-simple-perl/debian/changelog
trunk/libxml-libxml-simple-perl/lib/XML/LibXML/Simple.pm
Modified: trunk/libxml-libxml-simple-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-libxml-simple-perl/ChangeLog?rev=77399&op=diff
==============================================================================
--- trunk/libxml-libxml-simple-perl/ChangeLog (original)
+++ trunk/libxml-libxml-simple-perl/ChangeLog Tue Jul 12 11:38:28 2011
@@ -1,5 +1,10 @@
=== version history for XML::LibXML::Simple
+
+version 0.91: Mon Jul 11 22:40:02 CEST 2011
+ Fixes:
+ - forcearray option with one element
+ rt.cpan.org#69336 [Matt W Johnson]
version 0.90: Wed Jun 15 10:20:48 CEST 2011
Fixes:
Modified: trunk/libxml-libxml-simple-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-libxml-simple-perl/META.yml?rev=77399&op=diff
==============================================================================
--- trunk/libxml-libxml-simple-perl/META.yml (original)
+++ trunk/libxml-libxml-simple-perl/META.yml Tue Jul 12 11:38:28 2011
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: XML-LibXML-Simple
-version: 0.90
+version: 0.91
abstract: XML::LibXML based XML::Simple clone
author:
- Mark Overmeer
Modified: trunk/libxml-libxml-simple-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-libxml-simple-perl/Makefile.PL?rev=77399&op=diff
==============================================================================
--- trunk/libxml-libxml-simple-perl/Makefile.PL (original)
+++ trunk/libxml-libxml-simple-perl/Makefile.PL Tue Jul 12 11:38:28 2011
@@ -4,7 +4,7 @@
WriteMakefile
( NAME => 'XML::LibXML::Simple'
- , VERSION => '0.90'
+ , VERSION => '0.91'
, PREREQ_PM =>
{ XML::LibXML => 1.64
, Test::More => 0.54
Modified: trunk/libxml-libxml-simple-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-libxml-simple-perl/README?rev=77399&op=diff
==============================================================================
--- trunk/libxml-libxml-simple-perl/README (original)
+++ trunk/libxml-libxml-simple-perl/README Tue Jul 12 11:38:28 2011
@@ -1,5 +1,5 @@
-=== README for XML-LibXML-Simple version 0.90
-= Generated on Wed Jun 15 10:21:43 2011 by OODoc 2.00
+=== README for XML-LibXML-Simple version 0.91
+= Generated on Mon Jul 11 22:40:07 2011 by OODoc 2.00
There are various ways to install this module:
@@ -9,16 +9,16 @@
(2) if you use Windows, have a look at http://ppm.activestate.com/
(3) if you have downloaded this module manually (as root/administrator)
- gzip -d XML-LibXML-Simple-0.90.tar.gz
- tar -xf XML-LibXML-Simple-0.90.tar
- cd XML-LibXML-Simple-0.90
+ gzip -d XML-LibXML-Simple-0.91.tar.gz
+ tar -xf XML-LibXML-Simple-0.91.tar
+ cd XML-LibXML-Simple-0.91
perl Makefile.PL
make # optional
make test # optional
make install
For usage, see the included manual-pages or
- http://search.cpan.org/dist/XML-LibXML-Simple-0.90/
+ http://search.cpan.org/dist/XML-LibXML-Simple-0.91/
Please report problems to
http://rt.cpan.org/Dist/Display.html?Queue=XML-LibXML-Simple
Modified: trunk/libxml-libxml-simple-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-libxml-simple-perl/debian/changelog?rev=77399&op=diff
==============================================================================
--- trunk/libxml-libxml-simple-perl/debian/changelog (original)
+++ trunk/libxml-libxml-simple-perl/debian/changelog Tue Jul 12 11:38:28 2011
@@ -1,3 +1,10 @@
+libxml-libxml-simple-perl (0.91-1) UNRELEASED; urgency=low
+
+ * Team upload.
+ * New upstream release
+
+ -- Salvatore Bonaccorso <carnil at debian.org> Tue, 12 Jul 2011 13:37:51 +0200
+
libxml-libxml-simple-perl (0.90-1) unstable; urgency=low
* Team upload.
Modified: trunk/libxml-libxml-simple-perl/lib/XML/LibXML/Simple.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libxml-libxml-simple-perl/lib/XML/LibXML/Simple.pm?rev=77399&op=diff
==============================================================================
--- trunk/libxml-libxml-simple-perl/lib/XML/LibXML/Simple.pm (original)
+++ trunk/libxml-libxml-simple-perl/lib/XML/LibXML/Simple.pm Tue Jul 12 11:38:28 2011
@@ -4,7 +4,7 @@
# Pod stripped from pm file by OODoc 2.00.
package XML::LibXML::Simple;
use vars '$VERSION';
-$VERSION = '0.90';
+$VERSION = '0.91';
use base 'Exporter';
use strict;
@@ -154,15 +154,19 @@
$opt{searchpath} ||= [];
ref $opt{searchpath} eq 'ARRAY'
- or $opt{searchpath} = [ $opt{searchpath} ];
-
- my $fa = delete $opt{forcearray};
- my @fa = ref $fa eq 'ARRAY' ? @$fa : defined $fa ? $fa : ();
- $opt{forcearray_always} = (@fa==1 && !ref $fa[0] && $fa[0]);
- $opt{forcearray_regex} = [ grep {ref $_ eq 'Regexp'} @fa ];
-
- $opt{forcearray_elem} = {};
- $opt{forcearray_elem}{$_} = 1 for grep !ref $_, @fa;
+ or $opt{searchpath} = [ $opt{searchpath} ];
+
+ my $fa = delete $opt{forcearray} || 0;
+ my (@fa_regex, %fa_elem);
+ if(ref $fa)
+ { foreach (ref $fa eq 'ARRAY' ? @$fa : $fa)
+ { if(ref $_ eq 'Regexp') { push @fa_regex, $_ }
+ else { $fa_elem{$_} = 1 }
+ }
+ }
+ else { $opt{forcearray_always} = $fa }
+ $opt{forcearray_regex} = \@fa_regex;
+ $opt{forcearray_elem} = \%fa_elem;
# Special cleanup for {keyattr} which could be arrayref or hashref,
# which behave differently.
@@ -226,23 +230,16 @@
if(defined $d->{$k})
{ # Combine duplicate attributes into arrayref if required
- if(ref $d->{$k} eq 'ARRAY')
- { push @{$d->{$k}}, $v }
- else { $d->{$k} = [ $d->{$k}, $v ] }
- }
- elsif(ref $v eq 'ARRAY')
- { push @{$d->{$k}}, $v }
+ if(ref $d->{$k} eq 'ARRAY') { push @{$d->{$k}}, $v }
+ else { $d->{$k} = [ $d->{$k}, $v ] } }
+ elsif(ref $v eq 'ARRAY') { push @{$d->{$k}}, $v }
elsif(ref $v eq 'HASH'
&& $k ne $opts->{contentkey}
- && $opts->{forcearray_always})
- { push @{$d->{$k}}, $v }
+ && $opts->{forcearray_always}) { push @{$d->{$k}}, $v }
elsif($opts->{forcearray_elem}{$k}
|| grep {$k =~ $_} @{$opts->{forcearray_regex}}
- )
- { push @{$d->{$k}}, $v }
- else
- { $d->{$k} = $v;
- }
+ ) { push @{$d->{$k}}, $v }
+ else { $d->{$k} = $v }
$d->{$k};
}
More information about the Pkg-perl-cvs-commits
mailing list