r60396 - in /trunk/libclass-date-perl: Changes Date.pm Date.xs META.yml debian/changelog debian/compat debian/control debian/copyright debian/rules debian/source/ debian/source/format
ansgar-guest at users.alioth.debian.org
ansgar-guest at users.alioth.debian.org
Mon Jul 19 03:51:57 UTC 2010
Author: ansgar-guest
Date: Mon Jul 19 03:51:48 2010
New Revision: 60396
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60396
Log:
* New upstream release.
+ No longer uses UNIVERSAL->import. (Closes: #578560)
* Use debhelper 7.
* Use source format 3.0 (quilt).
* Update debian/copyright to current version of DEP-5 proposal.
* Make build-dep on perl unversioned.
* Bump Standards-Version to 3.9.0.
* Add myself to Uploaders.
Added:
trunk/libclass-date-perl/debian/source/
trunk/libclass-date-perl/debian/source/format
Modified:
trunk/libclass-date-perl/Changes
trunk/libclass-date-perl/Date.pm
trunk/libclass-date-perl/Date.xs
trunk/libclass-date-perl/META.yml
trunk/libclass-date-perl/debian/changelog
trunk/libclass-date-perl/debian/compat
trunk/libclass-date-perl/debian/control
trunk/libclass-date-perl/debian/copyright
trunk/libclass-date-perl/debian/rules
Modified: trunk/libclass-date-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/Changes?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/Changes (original)
+++ trunk/libclass-date-perl/Changes Mon Jul 19 03:51:48 2010
@@ -1,4 +1,10 @@
Revision history for Perl extension Class::Date.
+
+1.1.10 Sun Jul 18 13:27:39 CEST 2010
+ - Remove the deprecated UNIVERSAL::import (Vladimir Timofeev)
+
+1.1.9 Sun May 14 22:52:50 CEST 2006
+ - Added "meridiam" and "ampm" methods by llarian
1.1.8 Sun Nov 6 16:36:54 CET 2005
- Added Env::C support for mod_perl environments
Modified: trunk/libclass-date-perl/Date.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/Date.pm?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/Date.pm (original)
+++ trunk/libclass-date-perl/Date.pm Mon Jul 19 03:51:48 2010
@@ -1,5 +1,5 @@
package Class::Date;
-# $Id: Date.pm 126 2005-11-21 21:16:16Z dlux $
+# $Id: Date.pm,v 8dbcc6b6035d 2008/11/23 00:41:11 dlux $
require 5.005_03;
@@ -12,7 +12,6 @@
$NOTZ_TIMEZONE $RESTORE_TZ
);
use Carp;
-use UNIVERSAL qw(isa);
use Exporter;
use DynaLoader;
@@ -34,7 +33,7 @@
@EXPORT_OK = (qw( date localdate gmdate now @ERROR_MESSAGES),
@{$EXPORT_TAGS{errors}});
- $VERSION = '1.1.9';
+ $VERSION = '1.1.10';
eval { Class::Date->bootstrap($VERSION); };
if ($@) {
warn "Cannot find the XS part of Class::Date, \n".
@@ -44,6 +43,15 @@
*strftime_xs = *POSIX::strftime;
*tzset_xs = *POSIX::tzset;
*tzname_xs = *POSIX::tzname;
+ }
+
+ # For older perls (version below 5.007003, where Scalar::Util not included
+ # in standard distribution) we use our own version of blessed
+ if ( eval { require Scalar::Util; 1 } ) {
+ *my_blessed = *Scalar::Util::blessed;
+ }
+ else {
+ *my_blessed = sub { eval { ref($_[0]) && $_[0]->can("isa"); } };
}
}
@@ -144,15 +152,15 @@
# if the prototype is an object, not a class, then the timezone will be
# the same
$tz = $proto->[c_tz]
- if defined($time) && !defined $tz && isa(ref($proto), __PACKAGE__ );
+ if defined($time) && !defined $tz && my_blessed($proto) && $proto->isa( __PACKAGE__ );
# Default timezone is used if the timezone cannot be determined otherwise
$tz = $DEFAULT_TIMEZONE if !defined $tz;
return $proto->new_invalid(E_UNDEFINED,"") if !defined $time;
- if (isa($time, __PACKAGE__ )) {
+ if (my_blessed($time) && $time->isa( __PACKAGE__ ) ) {
return $class->new_copy($time,$tz);
- } elsif (isa($time,'Class::Date::Rel')) {
+ } elsif (my_blessed($time) && $time->isa('Class::Date::Rel')) {
return $class->new_from_scalar($time,$tz);
} elsif (ref($time) eq 'ARRAY') {
return $class->new_from_array($time,$tz);
@@ -228,7 +236,7 @@
$obj->_recalc_from_epoch;
return $obj;
} elsif ($time =~ m{ ^\s* ( \d{0,4} ) - ( \d\d? ) - ( \d\d? )
- ( \s+ ( \d\d? ) : ( \d\d? ) ( : ( \d\d? ) (\.\d+)?)? )? }x) {
+ ( (?: T|\s+ ) ( \d\d? ) : ( \d\d? ) ( : ( \d\d? ) (\.\d+)?)? )? }x) {
my ($y,$m,$d,$hh,$mm,$ss)=($1,$2,$3,$5,$6,$8);
# ISO(-like) date
return $s->new_from_array([$y,$m,$d,$hh,$mm,$ss],$tz);
@@ -502,11 +510,11 @@
}
sub subtract { my ($s,$rhs)=@_;
- if (isa(ref($rhs), __PACKAGE__ )) {
+ if (my_blessed($rhs) && $rhs->isa( __PACKAGE__ )) {
my $dst_adjust = 0;
$dst_adjust = 60*60*( $s->[c_isdst]-$rhs->[c_isdst] ) if $DST_ADJUST;
return $s->ClassDateRel->new($s->[c_epoch]-$rhs->[c_epoch]+$dst_adjust);
- } elsif (isa(ref($rhs), "Class::Date::Rel")) {
+ } elsif (my_blessed($rhs) && $rhs->isa("Class::Date::Rel")) {
return $s->add(-$rhs);
} elsif ($rhs) {
return $s->add($s->ClassDateRel->new($rhs)->neg);
@@ -517,9 +525,9 @@
sub add { my ($s,$rhs)=@_;
local $RANGE_CHECK;
- $rhs=$s->ClassDateRel->new($rhs) if !isa($rhs,'Class::Date::Rel');
+ $rhs=$s->ClassDateRel->new($rhs) unless my_blessed($rhs) && $rhs->isa('Class::Date::Rel');
- return $s if !isa($rhs,'Class::Date::Rel');
+ return $s unless my_blessed($rhs) && $rhs->isa('Class::Date::Rel');
# adding seconds
my $retval= $rhs->[cs_sec] ?
@@ -562,7 +570,7 @@
sub get_epochs {
my ($lhs,$rhs,$reverse)=@_;
- if (!isa(ref($rhs), __PACKAGE__ )) {
+ unless (my_blessed($rhs) && $rhs->isa( __PACKAGE__ )) {
$rhs = $lhs->new($rhs);
}
my $repoch= $rhs ? $rhs->epoch : 0;
@@ -586,7 +594,6 @@
package Class::Date::Rel;
use strict;
use vars qw(@NEW_FROM_SCALAR);
-use UNIVERSAL qw(isa);
use Class::Date::Const;
use constant SEC_PER_MONTH => 2_629_744;
@@ -606,7 +613,7 @@
sub new { my ($proto,$val)=@_;
my $class = ref($proto) || $proto;
return undef if !defined $val;
- if (isa(ref($val), __PACKAGE__ )) {
+ if (Class::Date::my_blessed($val) && $val->isa( __PACKAGE__ )) {
return $class->new_copy($val);
} elsif (ref($val) eq 'ARRAY') {
return $class->new_from_array($val);
@@ -678,7 +685,7 @@
sub compare { my ($s,$val2,$reverse) = @_;
my $rev_multiply=$reverse ? -1 : 1;
- if (isa($val2, __PACKAGE__ )) {
+ if (Class::Date::my_blessed($val2) && $val2->isa( __PACKAGE__ )) {
return ($s->sec <=> $val2->sec) * $rev_multiply;
} else {
my $date_obj=$s->new($val2);
Modified: trunk/libclass-date-perl/Date.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/Date.xs?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/Date.xs (original)
+++ trunk/libclass-date-perl/Date.xs Mon Jul 19 03:51:48 2010
@@ -3,7 +3,7 @@
* Some functions (mini_mktime, strftime_xs) are borrowed from
* Matt Sergeant's Time::Object module
*
- * $Id: Date.xs 58 2003-08-16 12:41:29Z dlux $
+ * $Id: Date.xs,v b7a562a12fb9 2003/08/16 12:41:29 dlux $
*
*/
Modified: trunk/libclass-date-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/META.yml?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/META.yml (original)
+++ trunk/libclass-date-perl/META.yml Mon Jul 19 03:51:48 2010
@@ -1,10 +1,10 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Class-Date
-version: 1.1.9
+version: 1.1.10
version_from: Date.pm
installdirs: site
requires:
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30
Modified: trunk/libclass-date-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/debian/changelog?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/debian/changelog (original)
+++ trunk/libclass-date-perl/debian/changelog Mon Jul 19 03:51:48 2010
@@ -1,4 +1,4 @@
-libclass-date-perl (1.1.9-3) UNRELEASED; urgency=low
+libclass-date-perl (1.1.10-1) unstable; urgency=low
[ gregor herrmann ]
* debian/control: Changed: Switched Vcs-Browser field to ViewSVN
@@ -8,7 +8,17 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregoa at debian.org> Sun, 16 Nov 2008 20:40:32 +0100
+ [ Ansgar Burchardt ]
+ * New upstream release.
+ + No longer uses UNIVERSAL->import. (Closes: #578560)
+ * Use debhelper 7.
+ * Use source format 3.0 (quilt).
+ * Update debian/copyright to current version of DEP-5 proposal.
+ * Make build-dep on perl unversioned.
+ * Bump Standards-Version to 3.9.0.
+ * Add myself to Uploaders.
+
+ -- Ansgar Burchardt <ansgar at 43-1.org> Mon, 19 Jul 2010 12:50:51 +0900
libclass-date-perl (1.1.9-2) unstable; urgency=low
Modified: trunk/libclass-date-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/debian/compat?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/debian/compat (original)
+++ trunk/libclass-date-perl/debian/compat Mon Jul 19 03:51:48 2010
@@ -1,1 +1,1 @@
-6
+7
Modified: trunk/libclass-date-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/debian/control?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/debian/control (original)
+++ trunk/libclass-date-perl/debian/control Mon Jul 19 03:51:48 2010
@@ -2,9 +2,11 @@
Section: perl
Priority: optional
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Jay Bonci <jaybonci at debian.org>, MartÃn Ferrari <tincho at debian.org>
-Build-Depends: debhelper (>= 6), perl (>= 5.8.0-17)
-Standards-Version: 3.8.0
+Uploaders: Jay Bonci <jaybonci at debian.org>,
+ MartÃn Ferrari <tincho at debian.org>,
+ Ansgar Burchardt <ansgar at 43-1.org>
+Build-Depends: debhelper (>= 7), perl
+Standards-Version: 3.9.0
Homepage: http://search.cpan.org/dist/Class-Date/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libclass-date-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libclass-date-perl/
Modified: trunk/libclass-date-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/debian/copyright?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/debian/copyright (original)
+++ trunk/libclass-date-perl/debian/copyright Mon Jul 19 03:51:48 2010
@@ -1,27 +1,29 @@
-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-Upstream-Author: Szabó, Balázs <dlux at dlux.hu>
-Packaged-By: Jay Bonci <jay at bonci.com>
-Packaged-Date: Wed, 1 Jan 2003 22:44:16 -0500
-Original-Source-Location: http://search.cpan.org/dist/Class-Date/
-Original-Source-Command: uscan --force-download
-Original-Source-Depends: devscripts
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Szabó, Balázs <dlux at dlux.hu>
+Source: http://search.cpan.org/dist/Class-Date/
+Name: Class-Date
-Files: *
-Copyright: © 2001-2005 Szabó, Balázs (dLux)
- Portions © Matt Sergeant
-License: Artistic | GPL-1+
- This program is free software; you can redistribute it and/or modify it under
- the same terms as Perl itself.
+Copyright:
+ 2001, Szabó, Balázs (dLux)
+ Portions copyright Matt Sergeant
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: © 2008 Debian Perl Group <debian-perl at lists.debian.org>
- © 2003-2006 Jay Bonci <jaybonci at debian.org>
-License: other
- It is assumed the previous maintainer did choose a license compatible with
- upstream's.
+Copyright:
+ 2003-2006, Jay Bonci <jaybonci at debian.org>
+ 2008, MartÃn Ferrari <tincho at debian.org>
+License: Artistic or GPL-1+
-Perl is distributed under your choice of the GNU General Public License or
-the Artistic License. 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'.
+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'.
Modified: trunk/libclass-date-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/debian/rules?rev=60396&op=diff
==============================================================================
--- trunk/libclass-date-perl/debian/rules (original)
+++ trunk/libclass-date-perl/debian/rules Mon Jul 19 03:51:48 2010
@@ -1,61 +1,4 @@
#!/usr/bin/make -f
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-export PERL_MM_USE_DEFAULT=1
-
-PERL ?= /usr/bin/perl
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
-
-CFLAGS = -Wall -g
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-build: build-stamp
-build-stamp:
- dh_testdir
- $(PERL) Makefile.PL verbose INSTALLDIRS=vendor
- $(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
- $(MAKE) test
- touch $@
-
-clean:
- dh_testdir
- dh_testroot
- dh_clean install-stamp build-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
-
-install: install-stamp
-install-stamp: build-stamp
- dh_testdir
- dh_testroot
- dh_clean -k
- $(MAKE) PREFIX=/usr DESTDIR=$(TMP) install
- chmod -x $(TMP)/usr/lib/perl5/Class/Date.pod
- [ ! -d $(TMP)/usr/share/perl5 ] || \
- rmdir --ignore-fail-on-non-empty --parents --verbose \
- $(TMP)/usr/share/perl5
- touch $@
-
-binary-indep:
-binary-arch: build install
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installchangelogs Changes
- dh_shlibdeps
- dh_strip
- dh_perl
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+%:
+ dh $@
Added: trunk/libclass-date-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libclass-date-perl/debian/source/format?rev=60396&op=file
==============================================================================
--- trunk/libclass-date-perl/debian/source/format (added)
+++ trunk/libclass-date-perl/debian/source/format Mon Jul 19 03:51:48 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the Pkg-perl-cvs-commits
mailing list