From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 1 Mar 2006 04:26:06 +0000 (+0000)
Subject: Load /home/don/tmp/tmp.QFHG70/libhtml-calendarmonth-perl-1.18 into
X-Git-Tag: debian/2.04-1~4^2~8
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Flibhtml-calendarmonth-perl.git;a=commitdiff_plain;h=ddb50b302aac3e5b05ddd17c736ed8f58e623584

Load /home/don/tmp/tmp.QFHG70/libhtml-calendarmonth-perl-1.18 into
libhtml-calendarmonth-perl/branches/upstream/current.
---

diff --git a/current/Changes b/current/Changes
index c27997a..7f67f72 100644
--- a/current/Changes
+++ b/current/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/current/META.yml b/current/META.yml
index 7900645..2048e06 100644
--- a/current/META.yml
+++ b/current/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/current/Makefile.PL b/current/Makefile.PL
index 2bc6c3c..c293ba7 100644
--- a/current/Makefile.PL
+++ b/current/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/current/lib/HTML/CalendarMonth.pm b/current/lib/HTML/CalendarMonth.pm
index 70d1bbe..a3dd380 100644
--- a/current/lib/HTML/CalendarMonth.pm
+++ b/current/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/current/lib/HTML/CalendarMonth/DateTool/DateCalc.pm b/current/lib/HTML/CalendarMonth/DateTool/DateCalc.pm
index 97db691..17c3ed5 100644
--- a/current/lib/HTML/CalendarMonth/DateTool/DateCalc.pm
+++ b/current/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
@@ -58,7 +58,8 @@ sub week_of_year {
   $day || croak "Day required.\n";
   $month ||= $self->month;
   $year  ||= $self->year;
-  my($week, $year) = Week_of_Year($year, $month, $day);
+  my $week;
+  ($week, $year) = Week_of_Year($year, $month, $day);
   ($year, $week);
 }
 
diff --git a/current/t/testload.pm b/current/t/testload.pm
index d822ee7..cfb2546 100644
--- a/current/t/testload.pm
+++ b/current/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 = <D>;
 foreach (split(' ', $rds)) {
   ++$dates{$_};