r46058 - in /trunk/librose-datetime-perl: Changes META.yml Makefile.PL debian/changelog debian/compat debian/control debian/copyright debian/rules lib/Rose/DateTime.pm lib/Rose/DateTime/Parser.pm lib/Rose/DateTime/Util.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sun Oct 18 21:58:26 UTC 2009
Author: jawnsy-guest
Date: Sun Oct 18 21:58:21 2009
New Revision: 46058
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46058
Log:
* Use new short debhelper rules format
* Update copyright information
* Add myself to Uploaders and Copyright
* Bump compat level to 7
* Rewrote control description
Modified:
trunk/librose-datetime-perl/Changes
trunk/librose-datetime-perl/META.yml
trunk/librose-datetime-perl/Makefile.PL
trunk/librose-datetime-perl/debian/changelog
trunk/librose-datetime-perl/debian/compat
trunk/librose-datetime-perl/debian/control
trunk/librose-datetime-perl/debian/copyright
trunk/librose-datetime-perl/debian/rules
trunk/librose-datetime-perl/lib/Rose/DateTime.pm
trunk/librose-datetime-perl/lib/Rose/DateTime/Parser.pm
trunk/librose-datetime-perl/lib/Rose/DateTime/Util.pm
Modified: trunk/librose-datetime-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/Changes?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/Changes (original)
+++ trunk/librose-datetime-perl/Changes Sun Oct 18 21:58:21 2009
@@ -1,85 +1,89 @@
-0.532 (10.23.2006) - John Siracusa <siracusa at mindspring.com>
+0.533 (10.16.2009) - John Siracusa <siracusa at gmail.com>
+
+ * Updated eval blocks to avoid stomping on $@ from an outer scope.
+
+0.532 (10.23.2006) - John Siracusa <siracusa at gmail.com>
* Made compatible with DateTime 0.35 and DateTime::Locale 0.31.
(Patch by Lucian Dragus)
-0.531 (10.06.2006) - John Siracusa <siracusa at mindspring.com>
+0.531 (10.06.2006) - John Siracusa <siracusa at gmail.com>
* parse_date() now accepts "now!" as an alias for "now".
* Fixed a typo in the documentation.
-0.53 (06.07.2006) - John Siracusa <siracusa at mindspring.com>
+0.53 (06.07.2006) - John Siracusa <siracusa at gmail.com>
* parse_date() now accepts epoch values in the full range, not
just 9 or 10 digit numbers.
* Added parse_epoch() function to resolve the now-ambiguous parse_date()
behavior with respect to epochs and YYYYMMDD values.
-0.522 (04.08.2006) - John Siracusa <siracusa at mindspring.com>
+0.522 (04.08.2006) - John Siracusa <siracusa at gmail.com>
* Updated the test suite to account for systems that can't handle
negative epoch values. (Thanks to Michael Lackhoff)
-0.521 (04.05.2006) - John Siracusa <siracusa at mindspring.com>
+0.521 (04.05.2006) - John Siracusa <siracusa at gmail.com>
* Removed stray "._*" files from module distribution.
-0.52 (04.04.2006) - John Siracusa <siracusa at mindspring.com>
+0.52 (04.04.2006) - John Siracusa <siracusa at gmail.com>
* Allow negative and fractional epoch values in parse_date().
* Fixed a bug in the yyyy-mm-dd date parsing that caused it to
incorrectly match 10-digit seconds-since-epoch values.
(Reported by Peter Karman)
-0.51 (03.16.2006) - John Siracusa <siracusa at mindspring.com>
+0.51 (03.16.2006) - John Siracusa <siracusa at gmail.com>
* The european_dates() setting is now initialized as appropriate for
the current locale, discovered via to DateTime->DefaultLocale().
(Suggested by Michael Lackhoff)
-0.50 (03.07.2006) - John Siracusa <siracusa at mindspring.com>
+0.50 (03.07.2006) - John Siracusa <siracusa at gmail.com>
* Added support for Euorpean-style (dd/mm/yyyy) dates.
* Big version number bump to reflect progress towards 1.0.
-0.0134 (08.22.2005) - John Siracusa <siracusa at mindspring.com>
+0.0134 (08.22.2005) - John Siracusa <siracusa at gmail.com>
* Fixed incorrect version number in one file.
-0.0133 (08.20.2005) - John Siracusa <siracusa at mindspring.com>
+0.0133 (08.20.2005) - John Siracusa <siracusa at gmail.com>
* POD fixes.
-0.0131 (03.10.2005) - John Siracusa <siracusa at mindspring.com>
+0.0131 (03.10.2005) - John Siracusa <siracusa at gmail.com>
* Fixed POD errors in Rose::DateTime::Util.
-0.013 (02.26.2005) - John Siracusa <siracusa at mindspring.com>
+0.013 (02.26.2005) - John Siracusa <siracusa at gmail.com>
* Changed default time zone from 'local' to 'floating' in
Rose::DateTime::Util in order to avoid unnecessary overhead
when setting the time zone explicitly.
-0.0122 (12.14.2004) - John Siracusa <siracusa at mindspring.com>
+0.0122 (12.14.2004) - John Siracusa <siracusa at gmail.com>
* Ho hum, another day, another release. Documentation patch
again to fix more typos and further clarify local time zone
shenanigans.
-0.0121 (12.13.2004) - John Siracusa <siracusa at mindspring.com>
+0.0121 (12.13.2004) - John Siracusa <siracusa at gmail.com>
* Documentation patch to fix typos and clarify local time zone
shenanigans.
-0.012 (12.08.2004) - John Siracusa <siracusa at mindspring.com>
+0.012 (12.08.2004) - John Siracusa <siracusa at gmail.com>
* Fix attempt to fail gracefully when the local time zone cannot
be determined.
-0.011 (11.14.2004) - John Siracusa <siracusa at mindspring.com>
+0.011 (11.14.2004) - John Siracusa <siracusa at gmail.com>
* Added copyright info. Version 0.01 removed.
-0.01 (11.13.2004) - John Siracusa <siracusa at mindspring.com>
+0.01 (11.13.2004) - John Siracusa <siracusa at gmail.com>
* Initial release.
Modified: trunk/librose-datetime-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/META.yml?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/META.yml (original)
+++ trunk/librose-datetime-perl/META.yml Sun Oct 18 21:58:21 2009
@@ -1,13 +1,22 @@
--- #YAML:1.0
-name: Rose-DateTime
-version: 0.532
-abstract: ~
-license: ~
-generated_by: ExtUtils::MakeMaker version 6.31
-distribution_type: module
-requires:
- DateTime: 0
- Rose::Object: 0.82
+name: Rose-DateTime
+version: 0.533
+abstract: ~
+author: []
+license: unknown
+distribution_type: module
+configure_requires:
+ ExtUtils::MakeMaker: 0
+build_requires:
+ ExtUtils::MakeMaker: 0
+requires:
+ DateTime: 0
+ Rose::Object: 0.82
+no_index:
+ directory:
+ - t
+ - inc
+generated_by: ExtUtils::MakeMaker version 6.54
meta-spec:
- url: http://module-build.sourceforge.net/META-spec-v1.2.html
- version: 1.2
+ url: http://module-build.sourceforge.net/META-spec-v1.4.html
+ version: 1.4
Modified: trunk/librose-datetime-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/Makefile.PL?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/Makefile.PL (original)
+++ trunk/librose-datetime-perl/Makefile.PL Sun Oct 18 21:58:21 2009
@@ -5,7 +5,8 @@
WriteMakefile(NAME => 'Rose::DateTime',
PMLIBDIRS => [ 'lib' ],
VERSION_FROM => 'lib/Rose/DateTime.pm',
- dist => { DIST_CP => 'cp' }, # Avoid Mac OS X ._* files
+ ($^O =~ /darwin/i ?
+ (dist => { DIST_CP => 'cp' }) : ()), # Avoid Mac OS X ._* files
PREREQ_PM =>
{
'DateTime' => 0,
Modified: trunk/librose-datetime-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/debian/changelog?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/debian/changelog (original)
+++ trunk/librose-datetime-perl/debian/changelog Sun Oct 18 21:58:21 2009
@@ -2,6 +2,11 @@
[ Jonathan Yu ]
* New upstream release
+ * Use new short debhelper rules format
+ * Update copyright information
+ * Add myself to Uploaders and Copyright
+ * Bump compat level to 7
+ * Rewrote control description
[ gregor herrmann ]
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
Modified: trunk/librose-datetime-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/debian/compat?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/debian/compat (original)
+++ trunk/librose-datetime-perl/debian/compat Sun Oct 18 21:58:21 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/librose-datetime-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/debian/control?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/debian/control (original)
+++ trunk/librose-datetime-perl/debian/control Sun Oct 18 21:58:21 2009
@@ -1,27 +1,26 @@
Source: librose-datetime-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: perl (>= 5.8.8-7), libdatetime-perl, librose-object-perl (>= 0.82)
-Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: perl, libdatetime-perl, librose-object-perl (>= 0.82)
+Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
+ Jonathan Yu <jawnsy at cpan.org>
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/Rose-Class/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/librose-object-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/librose-object-perl/
-Standards-Version: 3.7.3
Package: librose-datetime-perl
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, libdatetime-perl, librose-object-perl (>= 0.82)
-Description: DateTime helper functions and objects
- The Rose::DateTime::* modules provide a few convenience functions and objects
- for use with DateTime dates.
+Depends: ${perl:Depends}, ${misc:Depends}, librose-object-perl (>= 0.82),
+ libdatetime-perl
+Description: collection of Perl modules for manipulating DateTime dates
+ Rose::DateTime is a collection of Perl modules that provide a few convenience
+ functions and objects for manipulating DateTime dates.
.
Rose::DateTime::Util contains a simple date parser and a slightly customized
date formatter.
.
Rose::DateTime::Parser encapsulates a date parser with an associated default
time zone.
- .
- Rose::DateTime exists mostly to provide a version number for CPAN.
- See the individual modules for some actual documentation.
Modified: trunk/librose-datetime-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/debian/copyright?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/debian/copyright (original)
+++ trunk/librose-datetime-perl/debian/copyright Sun Oct 18 21:58:21 2009
@@ -1,26 +1,30 @@
-This is the debian package for the Rose-DateTime module.
-It was created by Krzysztof Krzyzaniak (eloy) <eloy at debian.org> using dh-make-perl.
+Format-Specification:
+ http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
+Upstream-Maintainer: John C. Siracusa <siracusa at gmail.com>
+Upstream-Source: http://search.cpan.org/dist/Rose-DateTime/
+Upstream-Name: Rose-DateTime
-It was downloaded from http://search.cpan.org/dist/Rose-DateTime/
+Files: *
+Copyright: 2004-2006, John C. Siracusa <siracusa at gmail.com>
+License-Alias: Perl
+License: Artistic | GPL-1+
-The upstream author is:
+Files: debian/*
+Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+ 2007, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
+License: Artistic | GPL-1+
-John C. Siracusa (siracusa at mindspring.com).
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ On Debian GNU/Linux systems, the complete text of the Artistic License
+ can be found in `/usr/share/common-licenses/Artistic'
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
-Copyright (c) 2004-2006 by John C. Siracusa. All rights reserved.
-
-This program is free software, you can redistribute it and/or modify it under
-the same terms as Perl itself.
-
-Perl is distributed under licenses:
-
- a) the GNU General Public License as published by the Free Software
- Foundation; either version 1, or (at your option) any later
- version, or
-
- b) the "Artistic License" which comes with Perl.
-
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in /usr/share/common-licenses/GPL' and
- the Artistic Licence in /usr/share/common-licenses/Artistic'.
Modified: trunk/librose-datetime-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/debian/rules?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/debian/rules (original)
+++ trunk/librose-datetime-perl/debian/rules Sun Oct 18 21:58:21 2009
@@ -1,61 +1,4 @@
#!/usr/bin/make -f
-# This debian/rules file is provided as a template for normal perl
-# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
-# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
-# be used freely wherever it is useful.
-export PERL_MM_USE_DEFAULT=1
-PACKAGE=$(shell dh_listpackages)
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-TMP =$(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="-Wall -O2 -g"
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- [ ! -f Makefile ] || $(MAKE) realclean
- dh_clean build-stamp install-stamp
-
-install: build install-stamp
-install-stamp:
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) test
- $(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
- [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
- touch install-stamp
-
-binary-arch:
-# We have nothing to do by default.
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_perl
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-source diff:
- @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+ dh $@
Modified: trunk/librose-datetime-perl/lib/Rose/DateTime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/lib/Rose/DateTime.pm?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/lib/Rose/DateTime.pm (original)
+++ trunk/librose-datetime-perl/lib/Rose/DateTime.pm Sun Oct 18 21:58:21 2009
@@ -2,7 +2,7 @@
use strict; # ha
-our $VERSION = '0.532';
+our $VERSION = '0.533';
1;
@@ -45,8 +45,8 @@
=head1 AUTHOR
-John C. Siracusa (siracusa at mindspring.com)
+John C. Siracusa (siracusa at gmail.com)
-=head1 COPYRIGHT
+=head1 LICENSE
Copyright (c) 2004-2006 by John C. Siracusa. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.
Modified: trunk/librose-datetime-perl/lib/Rose/DateTime/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/lib/Rose/DateTime/Parser.pm?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/lib/Rose/DateTime/Parser.pm (original)
+++ trunk/librose-datetime-perl/lib/Rose/DateTime/Parser.pm Sun Oct 18 21:58:21 2009
@@ -143,8 +143,8 @@
=head1 AUTHOR
-John C. Siracusa (siracusa at mindspring.com)
+John C. Siracusa (siracusa at gmail.com)
-=head1 COPYRIGHT
+=head1 LICENSE
Copyright (c) 2004-2006 by John C. Siracusa. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.
Modified: trunk/librose-datetime-perl/lib/Rose/DateTime/Util.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/librose-datetime-perl/lib/Rose/DateTime/Util.pm?rev=46058&op=diff
==============================================================================
--- trunk/librose-datetime-perl/lib/Rose/DateTime/Util.pm (original)
+++ trunk/librose-datetime-perl/lib/Rose/DateTime/Util.pm Sun Oct 18 21:58:21 2009
@@ -18,7 +18,7 @@
all => \@EXPORT_OK
);
-our $VERSION = '0.532';
+our $VERSION = '0.533';
our $TZ = 'floating';
our $Debug = 0;
@@ -88,11 +88,18 @@
{
if(@_ > 1)
{
- eval { $arg->set_time_zone($time_zone) };
-
- if($@)
+ my $error;
+
+ TRY:
{
- $Error = $@;
+ local $@;
+ eval { $arg->set_time_zone($time_zone) };
+ $error = $@;
+ }
+
+ if($error)
+ {
+ $Error = $error;
return undef;
}
}
@@ -374,21 +381,30 @@
}
}
- eval
- {
- $date = DateTime->new(year => $year,
- month => $month,
- day => $mday,
- hour => $hours,
- minute => $mins,
- second => $secs,
- nanosecond => $fsecs,
- time_zone => $tz);
- };
-
- if($@)
- {
- $Error = $@;
+ my $error;
+
+ TRY:
+ {
+ local $@;
+
+ eval
+ {
+ $date = DateTime->new(year => $year,
+ month => $month,
+ day => $mday,
+ hour => $hours,
+ minute => $mins,
+ second => $secs,
+ nanosecond => $fsecs,
+ time_zone => $tz);
+ };
+
+ $error = $@;
+ }
+
+ if($error)
+ {
+ $Error = $error;
warn $Error if($Debug); # $ENV{'MOD_PERL'}
return;
}
@@ -788,8 +804,8 @@
=head1 AUTHOR
-John C. Siracusa (siracusa at mindspring.com)
-
-=head1 COPYRIGHT
+John C. Siracusa (siracusa at gmail.com)
+
+=head1 LICENSE
Copyright (c) 2004-2006 by John C. Siracusa. All rights reserved. This program is free software; you can redistribute it and/or modify it under the same terms as Perl itself.
More information about the Pkg-perl-cvs-commits
mailing list