r46342 - in /trunk/libcarp-clan-perl: Artistic.txt Changes GNU_GPL.txt MANIFEST META.yml Makefile.PL README debian/changelog lib/Carp/Clan.pm license/ t/01pod.t t/03yaml.t t/10basic.t t/11basic.t t/20pre560.t t/21pre560.t
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Oct 24 23:55:53 UTC 2009
Author: jawnsy-guest
Date: Sat Oct 24 23:55:47 2009
New Revision: 46342
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46342
Log:
IGNORE-VERSION: 6.04-1
Added:
trunk/libcarp-clan-perl/license/
- copied from r46341, branches/upstream/libcarp-clan-perl/current/license/
trunk/libcarp-clan-perl/t/20pre560.t
- copied unchanged from r46341, branches/upstream/libcarp-clan-perl/current/t/20pre560.t
trunk/libcarp-clan-perl/t/21pre560.t
- copied unchanged from r46341, branches/upstream/libcarp-clan-perl/current/t/21pre560.t
Removed:
trunk/libcarp-clan-perl/Artistic.txt
trunk/libcarp-clan-perl/GNU_GPL.txt
Modified:
trunk/libcarp-clan-perl/Changes
trunk/libcarp-clan-perl/MANIFEST
trunk/libcarp-clan-perl/META.yml
trunk/libcarp-clan-perl/Makefile.PL
trunk/libcarp-clan-perl/README
trunk/libcarp-clan-perl/debian/changelog
trunk/libcarp-clan-perl/lib/Carp/Clan.pm
trunk/libcarp-clan-perl/t/01pod.t
trunk/libcarp-clan-perl/t/03yaml.t
trunk/libcarp-clan-perl/t/10basic.t
trunk/libcarp-clan-perl/t/11basic.t
Modified: trunk/libcarp-clan-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/Changes?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/Changes (original)
+++ trunk/libcarp-clan-perl/Changes Sat Oct 24 23:55:47 2009
@@ -11,6 +11,10 @@
Version history:
----------------
+
+Version 6.04 24.10.2009
+ + Solved RT ticket #50796 (inform type of license)
+ + Made the test suite compatible with Perl versions < v5.6.0
Version 6.03 18.10.2009
+ Re-release to resolve confusion in CPAN caused by intermediate release
Modified: trunk/libcarp-clan-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/MANIFEST?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/MANIFEST (original)
+++ trunk/libcarp-clan-perl/MANIFEST Sat Oct 24 23:55:47 2009
@@ -1,13 +1,15 @@
-Artistic.txt
Changes
-GNU_GPL.txt
+MANIFEST
+Makefile.PL
+README
lib/Carp/Clan.pm
lib/Carp/Clan.pod
-Makefile.PL
-MANIFEST
-README
+license/Artistic.txt
+license/GNU_GPL.txt
t/01pod.t
t/03yaml.t
t/10basic.t
t/11basic.t
+t/20pre560.t
+t/21pre560.t
META.yml Module meta-data (added by MakeMaker)
Modified: trunk/libcarp-clan-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/META.yml?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/META.yml (original)
+++ trunk/libcarp-clan-perl/META.yml Sat Oct 24 23:55:47 2009
@@ -1,8 +1,8 @@
--- #YAML:1.0
name: Carp-Clan
-version: 6.03
+version: 6.04
abstract: Report errors from perspective of caller of a "clan" of modules
-license: ~
+license: perl
author:
- Steffen Beyer <STBEY at cpan.org>
generated_by: ExtUtils::MakeMaker version 6.42
Modified: trunk/libcarp-clan-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/Makefile.PL?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/Makefile.PL (original)
+++ trunk/libcarp-clan-perl/Makefile.PL Sat Oct 24 23:55:47 2009
@@ -6,6 +6,7 @@
WriteMakefile(
NAME => 'Carp::Clan',
AUTHOR => 'Steffen Beyer <STBEY at cpan.org>',
+ LICENSE => 'perl',
VERSION_FROM => 'lib/Carp/Clan.pm',
ABSTRACT_FROM => 'lib/Carp/Clan.pod',
PREREQ_PM => { 'Test::Exception' => 0 },
Modified: trunk/libcarp-clan-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/README?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/README (original)
+++ trunk/libcarp-clan-perl/README Sat Oct 24 23:55:47 2009
@@ -26,9 +26,25 @@
What's new in this release:
---------------------------
-Version 6.03 18.10.2009
- + Re-release to resolve confusion in CPAN caused by intermediate release
- of Carp::Clan 5.4 (backport of bugfix #50560 below for Perls < v5.6.0)
+Version 6.04 24.10.2009
+ + Solved RT ticket #50796 (inform type of license)
+ + Made the test suite compatible with Perl versions < v5.6.0
+
+
+Copyright & License:
+--------------------
+
+This package with all its parts is
+
+Copyright (c) 2006-2009 by Joshua ben Jore <jjore at cpan.org>
+Copyright (c) 2001-2009 by Steffen Beyer <stbey at cpan.org>
+
+All rights reserved.
+
+This package is free software; you can use, modify and redistribute
+it under the same terms as Perl itself, i.e., at your option, under
+the terms either of the "Artistic License" or the "GNU General Public
+License".
Prerequisites:
@@ -55,21 +71,6 @@
Please refer to the file "Changes" in this distribution for a more
detailed version history log.
-
-
-Documentation:
---------------
-
-The documentation of this package is included in POD format (= "Plain
-Old Documentation") in the file with the extension ".pod" in this
-distribution, the human-readable markup-language standard for Perl
-documentation.
-
-By building this package, this documentation will automatically be
-converted into a man page, which will automatically be installed in
-your Perl tree for further reference through the installation process,
-where it can be accessed by the commands "man Carp::Clan" (Unix)
-and "perldoc Carp::Clan" (Unix and Win32 alike), for example.
What does it do:
Modified: trunk/libcarp-clan-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/debian/changelog?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/debian/changelog (original)
+++ trunk/libcarp-clan-perl/debian/changelog Sat Oct 24 23:55:47 2009
@@ -1,11 +1,11 @@
-libcarp-clan-perl (6.03-1) UNRELEASED; urgency=low
+libcarp-clan-perl (6.04-1) UNRELEASED; urgency=low
Fix for old perls (~5.6.0)
- IGNORE-VERSION: 6.03-1
+ IGNORE-VERSION: 6.04-1
* New upstream release
- -- Jonathan Yu <jawnsy at cpan.org> Mon, 19 Oct 2009 09:14:38 -0400
+ -- Jonathan Yu <jawnsy at cpan.org> Sat, 24 Oct 2009 16:15:03 -0400
libcarp-clan-perl (6.02-1) unstable; urgency=low
Modified: trunk/libcarp-clan-perl/lib/Carp/Clan.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/lib/Carp/Clan.pm?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/lib/Carp/Clan.pm (original)
+++ trunk/libcarp-clan-perl/lib/Carp/Clan.pm Sat Oct 24 23:55:47 2009
@@ -1,7 +1,7 @@
##
## Based on Carp.pm from Perl 5.005_03.
-## Last modified 17-Oct-2009 by Steffen Beyer.
+## Last modified 24-Oct-2009 by Steffen Beyer.
## Should be reasonably backwards compatible.
##
## This module is free software and can
@@ -28,7 +28,7 @@
$Verbose = 0; # If true then make _shortmsg call _longmsg instead.
-$VERSION = '6.03';
+$VERSION = '6.04';
# _longmsg() crawls all the way up the stack reporting on all the function
# calls made. The error string, $error, is originally constructed from the
Modified: trunk/libcarp-clan-perl/t/01pod.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/t/01pod.t?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/t/01pod.t (original)
+++ trunk/libcarp-clan-perl/t/01pod.t Sat Oct 24 23:55:47 2009
@@ -1,16 +1,19 @@
#!perl
-use Test::More;
-if ( not $ENV{AUTHOR_TESTS} ) {
- plan skip_all => 'Skipping author tests';
+BEGIN
+{
+ unless ($ENV{AUTHOR_TESTS}) { print "1..0 # skip Skipping author tests\n"; exit 0; }
+ eval { require Test::More; Test::More->import(); };
+ if ($@) { print "1..0 # skip Test::More is not available on this platform\n"; exit 0; }
+ eval { require Test::Pod; Test::Pod->import(); };
+ if ($@) { print "1..0 # skip Test::Pod is not available on this platform\n"; exit 0; }
}
-else {
- require Test::Pod;
- Test::Pod->import;
- my $version = Test::Pod->VERSION;
- if ( $version < 1.14 ) {
- die
- "Test::Pod::Coverage version 1.14 required--this is only version $version";
- }
- all_pod_files_ok();
-}
+
+use strict;
+
+my $version = Test::Pod->VERSION;
+if ( $version < 1.14 ) { die "Test::Pod::Coverage version 1.14 required--this is only version $version"; }
+all_pod_files_ok();
+
+__END__
+
Modified: trunk/libcarp-clan-perl/t/03yaml.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/t/03yaml.t?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/t/03yaml.t (original)
+++ trunk/libcarp-clan-perl/t/03yaml.t Sat Oct 24 23:55:47 2009
@@ -1,13 +1,18 @@
#!perl
-use Test::More;
-if ( not $ENV{AUTHOR_TESTS} ) {
- plan skip_all => 'Skipping author tests';
+BEGIN
+{
+ unless ($ENV{AUTHOR_TESTS}) { print "1..0 # skip Skipping author tests\n"; exit 0; }
+ eval { require Test::More; Test::More->import(); };
+ if ($@) { print "1..0 # skip Test::More is not available on this platform\n"; exit 0; }
+ eval { require YAML; YAML->import('LoadFile'); };
+ if ($@) { print "1..0 # skip YAML is not available on this platform\n"; exit 0; }
}
-else {
- plan tests => 1;
- require YAML;
- YAML->import('LoadFile');
- ok( LoadFile("META.yml") );
-}
+use strict;
+
+plan tests => 1;
+ok( LoadFile("META.yml") );
+
+__END__
+
Modified: trunk/libcarp-clan-perl/t/10basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/t/10basic.t?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/t/10basic.t (original)
+++ trunk/libcarp-clan-perl/t/10basic.t Sat Oct 24 23:55:47 2009
@@ -1,8 +1,16 @@
#!perl -w
+BEGIN
+{
+ eval { require Test::More; Test::More->import(); };
+ if ($@) { print "1..0 # skip Test::More is not available on this platform\n"; exit 0; }
+ eval { require Test::Exception; Test::Exception->import(); };
+ if ($@) { print "1..0 # skip Test::Exception is not available on this platform\n"; exit 0; }
+}
+
use strict;
-use Test::More tests => 2;
-use Test::Exception;
+
+plan tests => 2;
use_ok( 'Carp::Clan', 'Use Carp::Clan' );
@@ -13,3 +21,6 @@
},
'No errors importing'
);
+
+__END__
+
Modified: trunk/libcarp-clan-perl/t/11basic.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcarp-clan-perl/t/11basic.t?rev=46342&op=diff
==============================================================================
--- trunk/libcarp-clan-perl/t/11basic.t (original)
+++ trunk/libcarp-clan-perl/t/11basic.t Sat Oct 24 23:55:47 2009
@@ -1,4 +1,9 @@
#!perl -w
+
+#BEGIN
+#{
+# if ($] < 5.006) { print "1..0 # skip current Perl version $] < 5.006000\n"; exit 0; }
+#}
use strict;
@@ -41,7 +46,7 @@
my %skip_import_tests;
{
no strict 'refs';
- @skip_import_tests{ grep { exists &{"main::$_"} }
+ @skip_import_tests{ grep { exists(${*{'main::'}}{$_}) and defined(&{${*{'main::'}}{$_}}) }
qw( croak confess carp cluck ) } = ();
}
@@ -58,7 +63,7 @@
print
"ok $n # skip $function was already defined. Can't test import\n";
}
- elsif ( not exists &{"main::$function"} ) {
+ elsif ( not (exists(${*{'main::'}}{$function}) and defined(&{${*{'main::'}}{$function}})) ) {
print "ok $n\n";
}
else {
@@ -802,7 +807,7 @@
}
}
else {
- print "ok $n # skip Object::Deadly not installed\n";
+ print "ok $n # skip Object::Deadly is not available on this platform\n";
}
$n++;
More information about the Pkg-perl-cvs-commits
mailing list