r54627 - in /trunk/libdatetime-astro-sunrise-perl: Sunrise.pm debian/changelog debian/patches/drop_stray_debug.patch debian/patches/normalise_24_hours.patch debian/patches/pod.patch debian/patches/posix.patch debian/patches/series
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Sun Mar 21 18:08:26 UTC 2010
Author: gregoa
Date: Sun Mar 21 18:07:57 2010
New Revision: 54627
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=54627
Log:
Split out changes to upstream code into patches.
Added:
trunk/libdatetime-astro-sunrise-perl/debian/patches/normalise_24_hours.patch
trunk/libdatetime-astro-sunrise-perl/debian/patches/pod.patch
trunk/libdatetime-astro-sunrise-perl/debian/patches/posix.patch
Removed:
trunk/libdatetime-astro-sunrise-perl/debian/patches/drop_stray_debug.patch
Modified:
trunk/libdatetime-astro-sunrise-perl/Sunrise.pm
trunk/libdatetime-astro-sunrise-perl/debian/changelog
trunk/libdatetime-astro-sunrise-perl/debian/patches/series
Modified: trunk/libdatetime-astro-sunrise-perl/Sunrise.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-astro-sunrise-perl/Sunrise.pm?rev=54627&op=diff
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/Sunrise.pm (original)
+++ trunk/libdatetime-astro-sunrise-perl/Sunrise.pm Sun Mar 21 18:07:57 2010
@@ -2,7 +2,7 @@
use strict;
require Exporter;
-use POSIX qw(floor);
+use POSIX;
use Math::Trig;
use Carp;
use DateTime;
@@ -101,12 +101,11 @@
}
my ( $hour_rise, $min_rise, $hour_set, $min_set ) = convert_hour($tmp_rise_3,$tmp_set_3);
- print STDERR "me\n";
my $rise_time = DateTime->new(
year => $dt->year,
month => $dt->month,
day => $dt->day,
- hour => $hour_rise % 24,
+ hour => $hour_rise,
minute => $min_rise,
time_zone => 'UTC'
);
@@ -114,7 +113,7 @@
year => $dt->year,
month => $dt->month,
day => $dt->day,
- hour => $hour_set % 24,
+ hour => $hour_set,
minute => $min_set,
time_zone => 'UTC'
);
@@ -133,7 +132,7 @@
year => $dt->year,
month => $dt->month,
day => $dt->day,
- hour => $hour_rise % 24,
+ hour => $hour_rise,
minute => $min_rise,
time_zone => 'UTC'
);
@@ -141,7 +140,7 @@
year => $dt->year,
month => $dt->month,
day => $dt->day,
- hour => $hour_set % 24,
+ hour => $hour_set,
minute => $min_set,
time_zone => 'UTC'
);
@@ -478,13 +477,11 @@
return ( $hour_rise, $min_rise, $hour_set, $min_set );
}
-
=head1 NAME
DateTime::Astro::Sunrise - Perl DateTime extension for computing the sunrise/sunset on a given day
=head1 SYNOPSIS
-
use DateTime;
use DateTime::Astro::Sunrise;
@@ -509,7 +506,6 @@
=item B<my $sunrise = DateTime::Astro::Sunrise ->new(longitutide,latatude,ALT,Iteration);>
=over
-
Eastern longitude is entered as a positive number
Western longitude is entered as a negative number
Northern latitude is entered as a positive number
Modified: trunk/libdatetime-astro-sunrise-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-astro-sunrise-perl/debian/changelog?rev=54627&op=diff
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/changelog (original)
+++ trunk/libdatetime-astro-sunrise-perl/debian/changelog Sun Mar 21 18:07:57 2010
@@ -1,8 +1,4 @@
libdatetime-astro-sunrise-perl (0.01.01-3) UNRELEASED; urgency=low
-
- WARNING: I get a huge diff between what I get via uscan and our SVN
- Investigation needed. MD5 does not match what is in Debian
- --dam
[ gregor herrmann ]
* Use dist-based URL in debian/watch.
@@ -29,6 +25,7 @@
* New patch sunrise-march.patch to fix sunset times around first day of
spring; thanks to Joey Hess for the bug report and to pointer to the patch
(closes: #574749).
+ * Split out changes to upstream code into patches.
-- gregor herrmann <gregor+debian at comodo.priv.at> Sat, 01 Dec 2007 23:33:34 +0100
Added: trunk/libdatetime-astro-sunrise-perl/debian/patches/normalise_24_hours.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-astro-sunrise-perl/debian/patches/normalise_24_hours.patch?rev=54627&op=file
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/patches/normalise_24_hours.patch (added)
+++ trunk/libdatetime-astro-sunrise-perl/debian/patches/normalise_24_hours.patch Sun Mar 21 18:07:57 2010
@@ -1,0 +1,44 @@
+Description: Fix it not to pass hour values out of range to DateTime->new.
+ It seemed to rely on DateTime normalising them to the 0-23 range, but
+ DateTime now crashes instead. Take the hour value mod 24 to avoid this, and
+ the test suite passes now.
+Author: Joey Hess <joeyh at debian.org>
+
+--- a/Sunrise.pm
++++ b/Sunrise.pm
+@@ -105,7 +105,7 @@ sub sunrise {
+ year => $dt->year,
+ month => $dt->month,
+ day => $dt->day,
+- hour => $hour_rise,
++ hour => $hour_rise % 24,
+ minute => $min_rise,
+ time_zone => 'UTC'
+ );
+@@ -113,7 +113,7 @@ sub sunrise {
+ year => $dt->year,
+ month => $dt->month,
+ day => $dt->day,
+- hour => $hour_set,
++ hour => $hour_set % 24,
+ minute => $min_set,
+ time_zone => 'UTC'
+ );
+@@ -132,7 +132,7 @@ sub sunrise {
+ year => $dt->year,
+ month => $dt->month,
+ day => $dt->day,
+- hour => $hour_rise,
++ hour => $hour_rise % 24,
+ minute => $min_rise,
+ time_zone => 'UTC'
+ );
+@@ -140,7 +140,7 @@ sub sunrise {
+ year => $dt->year,
+ month => $dt->month,
+ day => $dt->day,
+- hour => $hour_set,
++ hour => $hour_set % 24,
+ minute => $min_set,
+ time_zone => 'UTC'
+ );
Added: trunk/libdatetime-astro-sunrise-perl/debian/patches/pod.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-astro-sunrise-perl/debian/patches/pod.patch?rev=54627&op=file
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/patches/pod.patch (added)
+++ trunk/libdatetime-astro-sunrise-perl/debian/patches/pod.patch Sun Mar 21 18:07:57 2010
@@ -1,0 +1,28 @@
+Author: Joey Hess <joeyh at debian.org>
+Description: Fixed missing whitespace in pod doc that caused the man page to
+ be broken in several ways.
+
+--- a/Sunrise.pm
++++ b/Sunrise.pm
+@@ -477,11 +477,13 @@ sub convert_hour {
+
+ return ( $hour_rise, $min_rise, $hour_set, $min_set );
+ }
++
+ =head1 NAME
+
+ DateTime::Astro::Sunrise - Perl DateTime extension for computing the sunrise/sunset on a given day
+
+ =head1 SYNOPSIS
++
+ use DateTime;
+ use DateTime::Astro::Sunrise;
+
+@@ -506,6 +508,7 @@ This module will return a DateTime Objec
+ =item B<my $sunrise = DateTime::Astro::Sunrise ->new(longitutide,latatude,ALT,Iteration);>
+
+ =over
++
+ Eastern longitude is entered as a positive number
+ Western longitude is entered as a negative number
+ Northern latitude is entered as a positive number
Added: trunk/libdatetime-astro-sunrise-perl/debian/patches/posix.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-astro-sunrise-perl/debian/patches/posix.patch?rev=54627&op=file
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/patches/posix.patch (added)
+++ trunk/libdatetime-astro-sunrise-perl/debian/patches/posix.patch Sun Mar 21 18:07:57 2010
@@ -1,0 +1,15 @@
+Author: Joey Hess <joeyh at debian.org>
+Description: Fix redefinition warnings under use strict that were caused by
+ POSIX and Math::Trig defining some of the same functions.
+
+--- a/Sunrise.pm
++++ b/Sunrise.pm
+@@ -2,7 +2,7 @@ package DateTime::Astro::Sunrise;
+
+ use strict;
+ require Exporter;
+-use POSIX;
++use POSIX qw(floor);
+ use Math::Trig;
+ use Carp;
+ use DateTime;
Modified: trunk/libdatetime-astro-sunrise-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-astro-sunrise-perl/debian/patches/series?rev=54627&op=diff
==============================================================================
--- trunk/libdatetime-astro-sunrise-perl/debian/patches/series (original)
+++ trunk/libdatetime-astro-sunrise-perl/debian/patches/series Sun Mar 21 18:07:57 2010
@@ -1,2 +1,4 @@
-drop_stray_debug.patch
+normalise_24_hours.patch
+pod.patch
+posix.patch
sunrise-march.patch
More information about the Pkg-perl-cvs-commits
mailing list