r2115 - in packages/libconfig-auto-perl/trunk: . debian lib/Config t t/config

Krzysztof Krzyzaniak eloy at costa.debian.org
Sun Feb 12 16:43:38 UTC 2006 

Author: eloy
Date: 2006-02-12 16:43:38 +0000 (Sun, 12 Feb 2006)
New Revision: 2115

Added:
   packages/libconfig-auto-perl/trunk/META.yml
   packages/libconfig-auto-perl/trunk/t/config/config.yml
   packages/libconfig-auto-perl/trunk/t/yaml.t
Modified:
   packages/libconfig-auto-perl/trunk/Changes
   packages/libconfig-auto-perl/trunk/MANIFEST
   packages/libconfig-auto-perl/trunk/Makefile.PL
   packages/libconfig-auto-perl/trunk/debian/changelog
   packages/libconfig-auto-perl/trunk/debian/control
   packages/libconfig-auto-perl/trunk/debian/watch
   packages/libconfig-auto-perl/trunk/lib/Config/Auto.pm
Log:
eloy: new upstream version


Modified: packages/libconfig-auto-perl/trunk/Changes
===================================================================
--- packages/libconfig-auto-perl/trunk/Changes	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/Changes	2006-02-12 16:43:38 UTC (rev 2115)
@@ -1,3 +1,7 @@
+0.15_01 Thu Aug 11 17:00:50 2005
+================================
+    - Added experimental YAML support
+
 0.14    Thu Aug 11 16:27:50 2005
 ================================
     - Fix uninitialized value warning

Modified: packages/libconfig-auto-perl/trunk/MANIFEST
===================================================================
--- packages/libconfig-auto-perl/trunk/MANIFEST	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/MANIFEST	2006-02-12 16:43:38 UTC (rev 2115)
@@ -1,12 +1,14 @@
 Changes
+lib/Config/Auto.pm
+Makefile.PL
 MANIFEST			This list of files
-Makefile.PL
+META.yml			Module meta-data (added by MakeMaker)
 README
-lib/Config/Auto.pm
 t/00.load.t
 t/colon.t
 t/config/colon.conf
 t/config/config.xml
+t/config/config.yml
 t/config/deb.conf
 t/config/nsswitch.conf
 t/config/passwd
@@ -19,4 +21,4 @@
 t/resolv.t
 t/winini.t
 t/xml.t
-
+t/yaml.t

Copied: packages/libconfig-auto-perl/trunk/META.yml (from rev 2114, packages/libconfig-auto-perl/branches/upstream/current/META.yml)

Modified: packages/libconfig-auto-perl/trunk/Makefile.PL
===================================================================
--- packages/libconfig-auto-perl/trunk/Makefile.PL	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/Makefile.PL	2006-02-12 16:43:38 UTC (rev 2115)
@@ -16,6 +16,7 @@
 
 my $prereqs = {
     'XML::Simple'       => 0,
+    'YAML'              => 0,
     'Config::IniFiles'  => 0,
 };
 delete $prereqs->{'XML::Simple'} unless $opts->{'x'};             

Modified: packages/libconfig-auto-perl/trunk/debian/changelog
===================================================================
--- packages/libconfig-auto-perl/trunk/debian/changelog	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/debian/changelog	2006-02-12 16:43:38 UTC (rev 2115)
@@ -1,3 +1,11 @@
+libconfig-auto-perl (0.16-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control - Added me to Uploaders
+  * debian/watch - updated
+
+ -- Krzysztof Krzyzaniak (eloy) <eloy at debian.org>  Sun, 12 Feb 2006 17:42:29 +0100
+
 libconfig-auto-perl (0.14-1) unstable; urgency=low
 
   * New upstream release. (Closes: #329517)

Modified: packages/libconfig-auto-perl/trunk/debian/control
===================================================================
--- packages/libconfig-auto-perl/trunk/debian/control	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/debian/control	2006-02-12 16:43:38 UTC (rev 2115)
@@ -4,7 +4,7 @@
 Build-Depends: debhelper (>= 4.0.2)
 Build-Depends-Indep: perl (>= 5.8.0-7), libconfig-inifiles-perl, libxml-simple-perl, libtest-pod-perl (>= 1.14-1)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Marc 'HE' Brockschmidt <he at debian.org>, Niko Tyni <ntyni at iki.fi>
+Uploaders: Marc 'HE' Brockschmidt <he at debian.org>, Niko Tyni <ntyni at iki.fi>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
 Standards-Version: 3.6.2
 
 Package: libconfig-auto-perl

Modified: packages/libconfig-auto-perl/trunk/debian/watch
===================================================================
--- packages/libconfig-auto-perl/trunk/debian/watch	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/debian/watch	2006-02-12 16:43:38 UTC (rev 2115)
@@ -1,3 +1,2 @@
 version=2
 http://mirrors.kernel.org/cpan/modules/by-module/Config/Config-Auto-([\.\d]+)\.tar\.gz
-

Modified: packages/libconfig-auto-perl/trunk/lib/Config/Auto.pm
===================================================================
--- packages/libconfig-auto-perl/trunk/lib/Config/Auto.pm	2006-02-12 16:42:22 UTC (rev 2114)
+++ packages/libconfig-auto-perl/trunk/lib/Config/Auto.pm	2006-02-12 16:43:38 UTC (rev 2115)
@@ -10,7 +10,7 @@
 
 use vars qw[$VERSION $DisablePerl $Untaint $Format];
 
-$VERSION = '0.14';
+$VERSION = '0.16';
 $DisablePerl = 0;
 $Untaint = 0;
 
@@ -24,6 +24,7 @@
     xml    => \&parse_xml,
     ini    => \&parse_ini,
     list   => \&return_list,
+    yaml   => \&yaml,
 );
 
 delete $methods{'xml'}
@@ -83,6 +84,9 @@
     my %score;
 
     for (@$data_r) {
+        ### it's almost definately YAML if the first line matches this
+        $score{yaml} += 20              if /--- #YAML:/ and $data_r->[0] eq $_;
+    
         # Easy to comment out foo=bar syntax
         $score{equal}++                 if /^\s*#\s*\w+\s*=/;
         next if /^\s*#/;
@@ -189,8 +193,10 @@
 }
 
 sub parse_xml   { return XMLin(shift); }
-sub parse_ini   { tie my %ini, 'Config::IniFiles', (-file=>$_[0]); return \%ini; }
+sub parse_ini   { tie my %ini, 'Config::IniFiles', (-file=>$_[0]); 
+                    return \%ini; }
 sub return_list { open my $fh, shift or die $!; return [<$fh>]; }
+sub yaml        { require YAML; return YAML::LoadFile( shift ) }
 
 sub bind_style  { croak "BIND8-style config not supported in this release" }
 sub irssi_style { croak "irssi-style config not supported in this release" }
@@ -472,9 +478,10 @@
 
 =item * list    => list (e.g., ??)
 
+=item * yaml    => yaml (via YAML.pm)
+
 =back
 
-
 =head1 TROUBLESHOOTING
 
 =over 4
@@ -498,7 +505,7 @@
 =head1 LICENSE
 
 This module is
-copyright (c) 2003 Jos Boumans E<lt>kane at cpan.orgE<gt>.
+copyright (c) 2003-2006 Jos Boumans E<lt>kane at cpan.orgE<gt>.
 All rights reserved.
 
 This library is free software;

Copied: packages/libconfig-auto-perl/trunk/t/config/config.yml (from rev 2114, packages/libconfig-auto-perl/branches/upstream/current/t/config/config.yml)

Copied: packages/libconfig-auto-perl/trunk/t/yaml.t (from rev 2114, packages/libconfig-auto-perl/branches/upstream/current/t/yaml.t)

More information about the Pkg-perl-cvs-commits mailing list