Commits

Palmer, 2E0EOL committed 201c482 Draft Merge

Merge backward compatible changes from stable branch into release/2

  • Participants
  • Parent commits bdbe928, f8078b3
  • Branches release/2

Comments (0)

Files changed (5)

 Daybo Logic Configuration Reader
-Copyright (C) 2010,2011 Daybo Logic
+Copyright (C) 2010,2012 Daybo Logic
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

lib/Daybo/ConfReader.pm

 #!/usr/bin/perl -w
 #
 # Daybo Logic Configuration Reader
-# Copyright (C) 2010,2011 Daybo Logic
+# Copyright (C) 2010,2012 Daybo Logic
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
+#----------------------------------------------------------------------------
 
 =item Daybo::ConfReader
 
 
 package Daybo::ConfReader;
 use Data::Dumper;
+
+our $VERSION = '2.1.0'; # Keep in sync with debian/changelog
 use constant DEFAULT_SECTION => ('DEFAULT');
 #----------------------------------------------------------------------------
 =item new
 ;
 ; Daybo Logic Configuration Reader
-; Copyright (C) 2010,2011 Daybo Logic
+; Copyright (C) 2010,2012 Daybo Logic
 ; All rights reserved.
 ;
 ; Redistribution and use in source and binary forms, with or without
 ; This .ini file is a test configuration to ensure that
 ; the Perl conf-reader can make some sense of it!
 ;
+;----------------------------------------------------------------------------
 
 user=overlord
 uid=1101
 #!/usr/bin/perl -w
 #
 # Daybo Logic Configuration Reader
-# Copyright (C) 2010,2011 Daybo Logic
+# Copyright (C) 2010,2012 Daybo Logic
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
+#!/usr/bin/perl -w
+#
+# Daybo Logic Configuration Reader
+# Copyright (C) 2010,2012 Daybo Logic
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. Neither the name of the project nor the names of its contributors
+#    may be used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# This is a testbed for the Daybo::ConfReader component
+#
+#----------------------------------------------------------------------------
+use Daybo::ConfReader;
+package main;
+use Test::More tests => 1;
+
+use constant CHECK_PKG => 'Daybo::ConfReader';
+use constant CHECK_VER => '2.1.0';
+
+is(
+	$Daybo::ConfReader::VERSION,
+	CHECK_VER(),
+	sprintf(
+		'%s::VERSION is \'%s\'',
+		CHECK_PKG(),
+		CHECK_VER()
+	)
+);