r59930 - in /trunk/libnagios-object-perl: Build.PL ChangeLog MANIFEST MANIFEST.SKIP META.yml README debian/changelog debian/control lib/Nagios/Object/Config.pm t/continuation_lines.t

carnil-guest at users.alioth.debian.org carnil-guest at users.alioth.debian.org
Wed Jun 30 05:49:32 UTC 2010


Author: carnil-guest
Date: Wed Jun 30 05:49:23 2010
New Revision: 59930

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=59930
Log:
* New upstream release
* Add myself to Uploaders.

Added:
    trunk/libnagios-object-perl/MANIFEST.SKIP
      - copied unchanged from r59929, branches/upstream/libnagios-object-perl/current/MANIFEST.SKIP
    trunk/libnagios-object-perl/t/continuation_lines.t
      - copied unchanged from r59929, branches/upstream/libnagios-object-perl/current/t/continuation_lines.t
Modified:
    trunk/libnagios-object-perl/Build.PL
    trunk/libnagios-object-perl/ChangeLog
    trunk/libnagios-object-perl/MANIFEST
    trunk/libnagios-object-perl/META.yml
    trunk/libnagios-object-perl/README
    trunk/libnagios-object-perl/debian/changelog
    trunk/libnagios-object-perl/debian/control
    trunk/libnagios-object-perl/lib/Nagios/Object/Config.pm

Modified: trunk/libnagios-object-perl/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/Build.PL?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/Build.PL (original)
+++ trunk/libnagios-object-perl/Build.PL Wed Jun 30 05:49:23 2010
@@ -3,8 +3,17 @@
 use Module::Build;
 
 my $build = Module::Build->new(
+    meta_merge => {
+        resources => {
+            repository => 'http://github.com/duncs/perl-nagios-object',
+            bugtracker =>
+                'https://rt.cpan.org/Public/Dist/Display.html?Name=Nagios-Object',
+            homepage => 'http://github.com/duncs/perl-nagios-object',
+        },
+    },
+
     dist_name      => 'Nagios-Object',
-    dist_version   => "0.21.10",
+    dist_version   => "0.21.12",
     dist_author    => 'Duncan Ferguson <duncs at cpan.org>',
     dist_abstract  => 'Nagios::Object - Nagios object configuration parsing.',
     license        => 'gpl',

Modified: trunk/libnagios-object-perl/ChangeLog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/ChangeLog?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/ChangeLog (original)
+++ trunk/libnagios-object-perl/ChangeLog Wed Jun 30 05:49:23 2010
@@ -108,3 +108,5 @@
 0.21.9 - Fixed speedup patch using logic similar to Nagios' for parsing status.dat
        - Added more comprehensive test for parsing status file
 0.21.10 - Fixed test failure on Perl 5.11 (RT #54464)
+0.21.11 - Added repository, bugtracker and homepage resources
+0.21.12 - Fixed continuation line handling - Thanks to payerle (RT#58906)

Modified: trunk/libnagios-object-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/MANIFEST?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/MANIFEST (original)
+++ trunk/libnagios-object-perl/MANIFEST Wed Jun 30 05:49:23 2010
@@ -11,6 +11,7 @@
 lib/Nagios/Object/Config.pm
 lib/Nagios/StatusLog.pm
 MANIFEST
+MANIFEST.SKIP
 META.yml
 README
 t/00object.t
@@ -27,6 +28,7 @@
 t/70status.t
 t/98nagios-sample-config.t
 t/99config-extend.t
+t/continuation_lines.t
 t/hostgroup_hostgroups.cfg
 t/hostgroup_hostgroups.t
 t/jfrancois.cfg

Modified: trunk/libnagios-object-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/META.yml?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/META.yml (original)
+++ trunk/libnagios-object-perl/META.yml Wed Jun 30 05:49:23 2010
@@ -1,14 +1,7 @@
 ---
-name: Nagios-Object
-version: 0.21.10
+abstract: 'Nagios::Object - Nagios object configuration parsing.'
 author:
   - 'Duncan Ferguson <duncs at cpan.org>'
-abstract: 'Nagios::Object - Nagios object configuration parsing.'
-license: gpl
-resources:
-  license: http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt
-requires:
-  perl: 5.6.1
 build_requires:
   Data::Dumper: 0.01
   Module::Build: 0.26
@@ -16,6 +9,14 @@
   Test::Exception: 0.01
   Test::More: 0.01
   Test::NoWarnings: 0.08
+configure_requires:
+  Module::Build: 0.36
+generated_by: 'Module::Build version 0.3603'
+license: gpl
+meta-spec:
+  url: http://module-build.sourceforge.net/META-spec-v1.4.html
+  version: 1.4
+name: Nagios-Object
 provides:
   Nagios::Config:
     file: lib/Nagios/Config.pm
@@ -40,7 +41,7 @@
     version: 40
   Nagios::Object::Config:
     file: lib/Nagios/Object/Config.pm
-    version: 36
+    version: 37
   Nagios::Program::Status:
     file: lib/Nagios/StatusLog.pm
     version: 0.1
@@ -56,7 +57,11 @@
   Nagios::StatusLog:
     file: lib/Nagios/StatusLog.pm
     version: 41
-generated_by: Module::Build version 0.33
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: 1.4
+requires:
+  perl: v5.6.1
+resources:
+  bugtracker: https://rt.cpan.org/Public/Dist/Display.html?Name=Nagios-Object
+  homepage: http://github.com/duncs/perl-nagios-object
+  license: http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt
+  repository: http://github.com/duncs/perl-nagios-object
+version: v0.21.12

Modified: trunk/libnagios-object-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/README?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/README (original)
+++ trunk/libnagios-object-perl/README Wed Jun 30 05:49:23 2010
@@ -22,7 +22,7 @@
 Bug Reports:
 
   Please report all bugs via the CPAN bugs RT system:
-    http://rt.cpan.org/NoAuth/Bugs.html?Dist=Nagios-Object
+    https://rt.cpan.org/Public/Dist/Display.html?Name=Nagios-Object
   In any bug report, include a short description of your problem and a copy 
 of the output from "Build test."  The more diagnostic information you send, 
 the better.

Modified: trunk/libnagios-object-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/changelog?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/changelog (original)
+++ trunk/libnagios-object-perl/debian/changelog Wed Jun 30 05:49:23 2010
@@ -1,3 +1,10 @@
+libnagios-object-perl (0.21.12-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Add myself to Uploaders.
+
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Wed, 30 Jun 2010 07:49:16 +0200
+
 libnagios-object-perl (0.21.10-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/libnagios-object-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/debian/control?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/debian/control (original)
+++ trunk/libnagios-object-perl/debian/control Wed Jun 30 05:49:23 2010
@@ -7,7 +7,8 @@
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jose Luis Rivas <ghostbar38 at gmail.com>,
  Ryan Niebur <ryan at debian.org>, gregor herrmann <gregoa at debian.org>,
- Jonathan Yu <jawnsy at cpan.org>
+ Jonathan Yu <jawnsy at cpan.org>,
+ Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
 Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libnagios-object-perl/
 Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libnagios-object-perl/

Modified: trunk/libnagios-object-perl/lib/Nagios/Object/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnagios-object-perl/lib/Nagios/Object/Config.pm?rev=59930&op=diff
==============================================================================
--- trunk/libnagios-object-perl/lib/Nagios/Object/Config.pm (original)
+++ trunk/libnagios-object-perl/lib/Nagios/Object/Config.pm Wed Jun 30 05:49:23 2010
@@ -27,7 +27,7 @@
 
 # NOTE: due to CPAN version checks this cannot currently be changed to a
 # standard version string, i.e. '0.21'
-our $VERSION     = '36';
+our $VERSION     = '37';
 our $fast_mode   = undef;
 our $strict_mode = undef;
 
@@ -178,15 +178,24 @@
     my ( $append, $type, $current, $in_definition ) = ( '', '', {}, undef );
     while ( my $line = strippedline($fh) ) {
 
-        # skip empty lines
-        next if ( $line eq ' ' );
-
         # append saved text to the current line
         if ($append) {
+            $line = '' unless $line;
             if ( $append !~ / $/ && $line !~ /^ / ) { $append .= ' ' }
             $line   = $append . $line;
             $append = undef;
         }
+
+	if ( $line && $line =~ /\\$/ )
+	{	#Continued line (ends in a '\')
+		#Remove \, append to $append, and let next iteration handle it
+		$line =~ s/\s*\\$//;
+		$append = $line;
+		next;
+	}
+
+        # skip empty lines (don't do earlier because may get stuff prepended)
+        next if ( $line eq ' ' );
 
         if ( $line =~ /include_file\s*=\s*([\w\-\/\\\:\.]+)/ ) {
             my $incfile = $1;




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