From: Don Armstrong <don@donarmstrong.com>
Date: Fri, 26 Feb 2010 22:40:48 +0000 (+0000)
Subject: * Fix FTBFS caused by new version of Date::Manip (closes: 571421)
X-Git-Tag: debian/1.19-2
X-Git-Url: https://git.donarmstrong.com/?p=deb_pkgs%2Flibhtml-calendarmonth-perl.git;a=commitdiff_plain;h=febd0b02136ed777f42c0e2b79d71db21c1805a8

* Fix FTBFS caused by new version of Date::Manip (closes: 571421)
* Bumb standards version; no changes needed
* Require debhelper 7
* Fix some minor POD errors
---

diff --git a/debian/changelog b/debian/changelog
index f350187..320eae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+libhtml-calendarmonth-perl (1.19-2) unstable; urgency=low
+
+  * Fix FTBFS caused by new version of Date::Manip (closes: 571421)
+  * Bumb standards version; no changes needed
+  * Require debhelper 7
+  * Fix some minor POD errors
+
+ -- Don Armstrong <don@debian.org>  Fri, 26 Feb 2010 13:08:35 -0800
+
 libhtml-calendarmonth-perl (1.19-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index b8626c4..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+7
diff --git a/debian/control b/debian/control
index 3cfb478..afa1096 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,17 @@
 Source: libhtml-calendarmonth-perl
 Section: perl
 Priority: extra
-Standards-Version: 3.8.0
+Standards-Version: 3.8.4
 Maintainer: Don Armstrong <don@debian.org>
-Build-Depends: debhelper (>= 4)
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: libhtml-element-extended-perl (>=1.15-0), libdatetime-locale-perl, libclass-accessor-perl, libdate-calc-perl, libdate-manip-perl, libdatetime-perl
 
 Package: libhtml-calendarmonth-perl
-Section: perl
-Priority: extra
 Architecture: all
-Depends: ${perl:Depends}, libhtml-element-extended-perl (>=1.15-0), libdatetime-locale-perl, libdate-calc-perl|libdate-manip-perl|libdatetime-perl, libclass-accessor-perl
+Depends: ${perl:Depends}, ${misc: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.
+ .
+ Useful for making calendars to display in web pages and other similar
+ tasks.
diff --git a/debian/rules b/debian/rules
index 627e74d..c5814f2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ clean:
 install: build test
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) install PREFIX=$(DESTDIR)/usr
diff --git a/lib/HTML/CalendarMonth.pm b/lib/HTML/CalendarMonth.pm
index 7ae7ae8..8d44456 100644
--- a/lib/HTML/CalendarMonth.pm
+++ b/lib/HTML/CalendarMonth.pm
@@ -968,10 +968,10 @@ DateTime::Locale->ids().
 All arguments appearing in [brackets] are optional, and do not represent
 anonymous array references.
 
-=over
-
 B<Constructor>
 
+=over
+
 =item new()
 
 With no arguments, the constructor will return a calendar object
diff --git a/lib/HTML/CalendarMonth/DateTool/DateManip.pm b/lib/HTML/CalendarMonth/DateTool/DateManip.pm
index 882aed6..3ed893c 100644
--- a/lib/HTML/CalendarMonth/DateTool/DateManip.pm
+++ b/lib/HTML/CalendarMonth/DateTool/DateManip.pm
@@ -52,7 +52,7 @@ sub add_days {
   $month ||= $self->month;
   $year  ||= $self->year;
   my $date = DateCalc(sprintf("%04d%02d%02d", $year, $month, $day),
-                      "+ $delta days");
+                      ($delta < 0 ? '':'+')." $delta days");
   my($y, $m, $d) = $date =~ /^(\d{4})(\d\d)(\d\d)/;
   $_ += 0 foreach ($y, $m, $d);
   ($d, $m, $y);
diff --git a/lib/HTML/CalendarMonth/Locale.pm b/lib/HTML/CalendarMonth/Locale.pm
index bb45bb3..063db73 100644
--- a/lib/HTML/CalendarMonth/Locale.pm
+++ b/lib/HTML/CalendarMonth/Locale.pm
@@ -201,12 +201,12 @@ developers:
 
 =head1 METHODS
 
+=over
+
 =item new()
 
 Constructor. Takes the following parameters:
 
-=over
-
 =item id
 
 Locale id, e.g. 'en_US'.
@@ -221,8 +221,6 @@ Default 0, use abbreviated days.
 Specifies whether full month names or their abbreviations are desired.
 Default 1, use full months.
 
-=back
-
 =item id()
 
 Returns the locale id used during object construction.
@@ -287,6 +285,8 @@ This is the method used to generate the minimal match hash referenced
 above. Given an arbitrary list, a hash reference will be returned with
 minimal match strings as keys and full names as values.
 
+=back
+
 =head1 AUTHOR
 
 Matthew P. Sisk, E<lt>F<sisk@mojotoad.com>E<gt>