r50695 - in /trunk/libdatetime-format-iso8601-perl/debian: changelog control patches/ patches/564411-fix_1_digit_year.patch patches/series source/ source/format
carnil-guest at users.alioth.debian.org
carnil-guest at users.alioth.debian.org
Mon Jan 11 07:54:52 UTC 2010
Author: carnil-guest
Date: Mon Jan 11 07:54:40 2010
New Revision: 50695
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=50695
Log:
* Convert to '3.0 (quilt)' source format.
* Add 564411-fix_1_digit_year.patch patch to fix FTBFS due to failed tests
testing one digit years formats (Closes: #564411).
* Add myself to Uploaders.
Added:
trunk/libdatetime-format-iso8601-perl/debian/patches/
trunk/libdatetime-format-iso8601-perl/debian/patches/564411-fix_1_digit_year.patch
trunk/libdatetime-format-iso8601-perl/debian/patches/series
trunk/libdatetime-format-iso8601-perl/debian/source/
trunk/libdatetime-format-iso8601-perl/debian/source/format
Modified:
trunk/libdatetime-format-iso8601-perl/debian/changelog
trunk/libdatetime-format-iso8601-perl/debian/control
Modified: trunk/libdatetime-format-iso8601-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-format-iso8601-perl/debian/changelog?rev=50695&op=diff
==============================================================================
--- trunk/libdatetime-format-iso8601-perl/debian/changelog (original)
+++ trunk/libdatetime-format-iso8601-perl/debian/changelog Mon Jan 11 07:54:40 2010
@@ -1,4 +1,4 @@
-libdatetime-format-iso8601-perl (0.06-2) UNRELEASED; urgency=low
+libdatetime-format-iso8601-perl (0.06-2) unstable; urgency=low
[ gregor herrmann ]
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
@@ -7,7 +7,13 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregoa at debian.org> Sun, 16 Nov 2008 20:41:30 +0100
+ [ Salvatore Bonaccorso ]
+ * Convert to '3.0 (quilt)' source format.
+ * Add 564411-fix_1_digit_year.patch patch to fix FTBFS due to failed tests
+ testing one digit years formats (Closes: #564411).
+ * Add myself to Uploaders.
+
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com> Mon, 11 Jan 2010 08:52:50 +0100
libdatetime-format-iso8601-perl (0.06-1) unstable; urgency=low
Modified: trunk/libdatetime-format-iso8601-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-format-iso8601-perl/debian/control?rev=50695&op=diff
==============================================================================
--- trunk/libdatetime-format-iso8601-perl/debian/control (original)
+++ trunk/libdatetime-format-iso8601-perl/debian/control Mon Jan 11 07:54:40 2010
@@ -4,7 +4,8 @@
Build-Depends: debhelper (>= 5), libmodule-build-perl, libdatetime-perl (>= 0.18), libdatetime-format-builder-perl (>= 0.77), libfile-find-rule-perl, libtest-distribution-perl, libtest-pod-perl
Build-Depends-Indep: perl (>= 5.6.10-12)
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: AGOSTINI Yves <agostini at univ-metz.fr>, Jaldhar H. Vyas <jaldhar at debian.org>
+Uploaders: AGOSTINI Yves <agostini at univ-metz.fr>, Jaldhar H. Vyas <jaldhar at debian.org>,
+ Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>
Standards-Version: 3.7.3
Homepage: http://search.cpan.org/dist/DateTime-Format-ISO8601/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdatetime-format-iso8601-perl/
Added: trunk/libdatetime-format-iso8601-perl/debian/patches/564411-fix_1_digit_year.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-format-iso8601-perl/debian/patches/564411-fix_1_digit_year.patch?rev=50695&op=file
==============================================================================
--- trunk/libdatetime-format-iso8601-perl/debian/patches/564411-fix_1_digit_year.patch (added)
+++ trunk/libdatetime-format-iso8601-perl/debian/patches/564411-fix_1_digit_year.patch Mon Jan 11 07:54:40 2010
@@ -1,0 +1,125 @@
+Description: Fix FBTFS on tests testing the one digit year formats
+ by correcting the _fix_1_digit_year subroutine.
+Origin: other, http://github.com/oalders/DateTime-Format-ISO8601/commit/ed1ed506e3f914bd78ec452e50ec15fefe19ac75
+Bug-Debian: http://bugs.debian.org/564411
+Bug: http://rt.cpan.org/Public/Bug/Display.html?id=53344
+Author: Olaf Alders
+--- a/lib/DateTime/Format/ISO8601.pm
++++ b/lib/DateTime/Format/ISO8601.pm
+@@ -112,7 +112,7 @@
+ },
+ }
+ );
+-
++
+ # ISO8601 only allows years 0 to 9999
+ # this implimentation ignores the needs of expanded formats
+ my $dt = DateTime->from_object( object => $args{ object } );
+@@ -182,7 +182,7 @@
+ params => [ qw( year month day ) ],
+ },
+ {
+- # uncombined with above because
++ # uncombined with above because
+ #regex => qr/^ (\d{4}) -?? (\d\d) -?? (\d\d) $/x,
+ # was matching 152746-05
+
+@@ -805,20 +805,18 @@
+
+ sub _fix_1_digit_year {
+ my %p = @_;
+-
+- no strict 'refs';
+- my $year = ( $p{ self }{ base_datetime } || DateTime->now )->year;
+- use strict;
+
+- $year =~ s/.$//;
+- $p{ parsed }{ year } = $year . $p{ parsed }{ year };
++ no strict 'refs';
++ my $year = ( $p{ self }{ base_datetime } || DateTime->now )->strftime('%C') * 100;
+
++ use strict;
++ $p{ parsed }{ year } = $year + $p{ parsed }{ year };
+ return 1;
+ }
+
+ sub _fix_2_digit_year {
+ my %p = @_;
+-
++
+ # this is a mess because of the need to support parse_* being called
+ # as a class method
+ no strict 'refs';
+@@ -904,7 +902,7 @@
+ sub _fractional_second {
+ my %p = @_;
+
+- $p{ parsed }{ nanosecond } = ".$p{ parsed }{ nanosecond }" * 10**9;
++ $p{ parsed }{ nanosecond } = ".$p{ parsed }{ nanosecond }" * 10**9;
+
+ return 1;
+ }
+@@ -912,7 +910,7 @@
+ sub _fractional_minute {
+ my %p = @_;
+
+- $p{ parsed }{ second } = ".$p{ parsed }{ second }" * 60;
++ $p{ parsed }{ second } = ".$p{ parsed }{ second }" * 60;
+
+ return 1;
+ }
+@@ -920,7 +918,7 @@
+ sub _fractional_hour {
+ my %p = @_;
+
+- $p{ parsed }{ minute } = ".$p{ parsed }{ minute }" * 60;
++ $p{ parsed }{ minute } = ".$p{ parsed }{ minute }" * 60;
+
+ return 1;
+ }
+@@ -953,7 +951,7 @@
+ my $dt = DateTime->new(
+ year => $p{ parsed }{ year },
+ );
+-
++
+ if ( $dt->week_number == 1 ) {
+ $p{ parsed }{ week } -= 1;
+ }
+--- a/t/02_examples.t
++++ b/t/02_examples.t
+@@ -228,7 +228,7 @@
+ {
+ #-YWwwD -5W155
+ my $dt = DateTime::Format::ISO8601->parse_datetime( '-5W155' );
+- is( $dt->year, '2005' );
++ is( $dt->year, '2005', '-5W155' );
+ is( $dt->week_number, '15' );
+ is( $dt->day_of_week, '5' );
+ }
+@@ -236,7 +236,7 @@
+ {
+ #-Y-Www-D -5-W15-5
+ my $dt = DateTime::Format::ISO8601->parse_datetime( '-5-W15-5' );
+- is( $dt->year, '2005' );
++ is( $dt->year, '2005', '-5-W15-5' );
+ is( $dt->week_number, '15' );
+ is( $dt->day_of_week, '5' );
+ }
+@@ -244,14 +244,14 @@
+ {
+ #-YWww -5W15
+ my $dt = DateTime::Format::ISO8601->parse_datetime( '-5W15' );
+- is( $dt->year, '2005' );
++ is( $dt->year, '2005', '-5W15' );
+ is( $dt->week_number, '15' );
+ }
+
+ {
+ #-Y-Www -5-W15
+ my $dt = DateTime::Format::ISO8601->parse_datetime( '-5-W15' );
+- is( $dt->year, '2005' );
++ is( $dt->year, '2005', '-5W15' );
+ is( $dt->week_number, '15' );
+ }
+
Added: trunk/libdatetime-format-iso8601-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-format-iso8601-perl/debian/patches/series?rev=50695&op=file
==============================================================================
--- trunk/libdatetime-format-iso8601-perl/debian/patches/series (added)
+++ trunk/libdatetime-format-iso8601-perl/debian/patches/series Mon Jan 11 07:54:40 2010
@@ -1,0 +1,1 @@
+564411-fix_1_digit_year.patch
Added: trunk/libdatetime-format-iso8601-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdatetime-format-iso8601-perl/debian/source/format?rev=50695&op=file
==============================================================================
--- trunk/libdatetime-format-iso8601-perl/debian/source/format (added)
+++ trunk/libdatetime-format-iso8601-perl/debian/source/format Mon Jan 11 07:54:40 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-perl-cvs-commits
mailing list