From 09c4bf9d9fcc7d456dd01cc8c55e75edacdd2415 Mon Sep 17 00:00:00 2001 From: Andrew Ruthven Date: Tue, 2 Aug 2016 23:32:50 +1200 Subject: [PATCH] DateCalc behaviour has changed, use a different mode. Somewhere between Date::Manip v6.0 and v6.32 the behaviour for DateCalc has changed, so that now a DateCalc will keep on increasing the hours field, without rolling over the days field. Switching to an approximate mode for DateCalc which resolves this. --- ChangeLog | 7 +++++++ THANKS | 1 + bin/mythtv-status | 2 +- debian/changelog | 6 ++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4b2b509..2eff48b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2016-08-02 Andrew Ruthven + Somewhere between Date::Manip v6.0 and v6.32 the behaviour for + DateCalc has changed, so that now a DateCalc will keep on + increasing the hours field, without rolling over the days field. + + Switching to an approximate mode for DateCalc which resolves this. + 2015-01-10 Andrew Ruthven Make the cron.d file for Debian use mythtv-update-motd to stop systemd from being upset. diff --git a/THANKS b/THANKS index c920ab5..b68304a 100644 --- a/THANKS +++ b/THANKS @@ -19,6 +19,7 @@ I'd like to thank the following people: - Steve Gunther - Doing some home work on the OSD declutter changes. - Julian Gilbey - Fixing up some errors in reporting the next scheduled recording. + - Göran Uddeborg- Reporting the DateCalc behaviour change. - The Debian translators - Especially the Portuguese guys - you rock! - All the MythTV developers for working on a great bit of software diff --git a/bin/mythtv-status b/bin/mythtv-status index 83cf6cc..122c4dc 100755 --- a/bin/mythtv-status +++ b/bin/mythtv-status @@ -464,7 +464,7 @@ my @blocks = ( if $next_time eq 'Never' || $next_time eq 'now'; my $err; - my $delta = DateCalc($c->{'date'} || 'now', $next_time, \$err, 0); + my $delta = DateCalc($c->{'date'} || 'now', $next_time, \$err, 1); my $seconds = Delta_Format($delta, 'approx', 0, '%sh'); # If the next recording is more than 1 day in the future, diff --git a/debian/changelog b/debian/changelog index 3b8b7f9..018f748 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +mythtv-status (0.10.8-1) unstable; urgency=low + + * New upstream release. + + -- Andrew Ruthven Tue, 02 Aug 2016 23:28:58 +1200 + mythtv-status (0.10.7-1) unstable; urgency=low * New upstream release (Closes: #772801). -- 2.30.2