From ce0063ff352f9e5b6659fccdc4eee5e49f815cef Mon Sep 17 00:00:00 2001 From: Don Armstrong Date: Wed, 1 Mar 2006 04:30:48 +0000 Subject: [PATCH] * Add 1.18 HTML::CalendarMonth upgrade --- Changes | 6 ++++++ META.yml | 5 +++-- Makefile.PL | 3 ++- debian/changelog | 6 ++++++ debian/control | 4 ++-- lib/HTML/CalendarMonth.pm | 4 ++-- lib/HTML/CalendarMonth/DateTool/DateCalc.pm | 2 +- t/testload.pm | 10 ++++++---- 8 files changed, 28 insertions(+), 12 deletions(-) diff --git a/Changes b/Changes index c27997a..7f67f72 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,11 @@ Revision history for Perl extension HTML-CalendarMonth. +1.18 Fri Feb 24 15:53:41 EST 2006 + - Fixed some scoping issues in DateTool/DateCalc.pm (thanks + Carl Franks) + - Fixed a Win32 test module location issue (File::Spec tricks) + (thanks Carl Franks) + 1.17 Fri Jan 6 16:09:46 EST 2006 - Updated tests with more recent test cases diff --git a/META.yml b/META.yml index 7900645..2048e06 100644 --- a/META.yml +++ b/META.yml @@ -1,13 +1,14 @@ # http://module-build.sourceforge.net/META-spec.html #XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX# name: HTML-CalendarMonth -version: 1.17 +version: 1.18 version_from: lib/HTML/CalendarMonth.pm installdirs: site requires: Class::Accessor: 0 DateTime::Locale: 0 - HTML::ElementTable: 1.13 + File::Spec: 0 + HTML::ElementTable: 1.15 Time::Local: 0 distribution_type: module diff --git a/Makefile.PL b/Makefile.PL index 2bc6c3c..c293ba7 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -43,9 +43,10 @@ WriteMakefile( VERSION_FROM => 'lib/HTML/CalendarMonth.pm', PREREQ_PM => { Time::Local => 0, - HTML::ElementTable => 1.13, + HTML::ElementTable => 1.15, DateTime::Locale => 0, Class::Accessor => 0, + File::Spec => 0, }, dist => { COMPRESS => 'gzip -9f', diff --git a/debian/changelog b/debian/changelog index a6666b7..99cc2ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libhtml-calendarmonth-perl (1.18-1) UNRELEASED; urgency=low + + * (NOT RELEASED YET) New upstream release + + -- Don Armstrong Tue, 28 Feb 2006 20:26:10 -0800 + libhtml-calendarmonth-perl (1.17-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index be72803..ab9c92f 100644 --- a/debian/control +++ b/debian/control @@ -3,13 +3,13 @@ Section: perl Priority: optional Standards-Version: 3.6.2 Maintainer: Don Armstrong -Build-Depends-Indep: libhtml-element-extended-perl (>=1.11-0), debhelper (>= 3.0.18), libdatetime-locale-perl, libclass-accessor-perl, libdate-calc-perl, libdate-manip-perl, libdatetime-perl +Build-Depends-Indep: libhtml-element-extended-perl (>=1.15-0), debhelper (>= 3.0.18), libdatetime-locale-perl, libclass-accessor-perl, libdate-calc-perl, libdate-manip-perl, libdatetime-perl Package: libhtml-calendarmonth-perl Section: perl Priority: optional Architecture: all -Depends: ${perl:Depends}, libhtml-element-extended-perl (>=1.11-0), libdatetime-locale-perl, libdate-calc-perl|libdate-manip-perl|libdatetime-perl, libclass-accessor-perl +Depends: ${perl:Depends}, libhtml-element-extended-perl (>=1.15-0), libdatetime-locale-perl, libdate-calc-perl|libdate-manip-perl|libdatetime-perl, libclass-accessor-perl Description: generate and manipulate calandar months in HTML This module enables you to generate and manipulate calendar months in HTML. diff --git a/lib/HTML/CalendarMonth.pm b/lib/HTML/CalendarMonth.pm index 70d1bbe..a3dd380 100644 --- a/lib/HTML/CalendarMonth.pm +++ b/lib/HTML/CalendarMonth.pm @@ -3,11 +3,11 @@ package HTML::CalendarMonth; use strict; use vars qw($VERSION @ISA); -$VERSION = '1.17'; +$VERSION = '1.18'; use Carp; -use HTML::ElementTable 1.13; +use HTML::ElementTable 1.15; use HTML::CalendarMonth::Locale; use HTML::CalendarMonth::DateTool; diff --git a/lib/HTML/CalendarMonth/DateTool/DateCalc.pm b/lib/HTML/CalendarMonth/DateTool/DateCalc.pm index 5a84087..17c3ed5 100644 --- a/lib/HTML/CalendarMonth/DateTool/DateCalc.pm +++ b/lib/HTML/CalendarMonth/DateTool/DateCalc.pm @@ -9,7 +9,7 @@ use vars qw(@ISA $VERSION); @ISA = qw(HTML::CalendarMonth::DateTool); -$VERSION = '0.01'; +$VERSION = '0.02'; use Date::Calc qw(Days_in_Month Day_of_Week Add_Delta_Days Weeks_in_Year Week_of_Year Week_Number Mktime diff --git a/t/testload.pm b/t/testload.pm index d822ee7..cfb2546 100644 --- a/t/testload.pm +++ b/t/testload.pm @@ -19,21 +19,23 @@ use File::Spec; use HTML::CalendarMonth; use HTML::CalendarMonth::DateTool; -my $base_dir; +my($base_dir, $vol, $dir); BEGIN { my $pkg = __PACKAGE__; $pkg =~ s%::%/%g; $pkg .= '.pm'; $pkg = File::Spec->canonpath($INC{$pkg}); - $pkg =~ s/\/[^\/]+\.pm$//; - $base_dir = $pkg; + my $file; + ($vol, $dir, $file) = File::Spec->splitpath($pkg); + $base_dir = File::Spec->catpath($vol, $dir); } $Dat_Dir = $base_dir; my($tcount, $rds, %dates, @tmethods, @twy_methods, @Cals); # Required test dates -open(D, "$Dat_Dir/test.dat") or die "Problem reading $Dat_Dir/test.dat: $!\n"; +my $dat_file = File::Spec->catpath($vol, $dir, 'test.dat'); +open(D, "<$dat_file") or die "Problem reading $dat_file: $!\n"; $rds = ; foreach (split(' ', $rds)) { ++$dates{$_}; -- 2.39.2