r1841 - in packages/libtk-pod-perl/branches/upstream/current: . t
Carlo Segre
segre-guest at costa.debian.org
Tue Jan 3 16:53:16 UTC 2006
Author: segre-guest
Date: 2006-01-03 16:53:15 +0000 (Tue, 03 Jan 2006)
New Revision: 1841
Added:
packages/libtk-pod-perl/branches/upstream/current/t/optionalmods.t
Modified:
packages/libtk-pod-perl/branches/upstream/current/Changes
packages/libtk-pod-perl/branches/upstream/current/MANIFEST
packages/libtk-pod-perl/branches/upstream/current/META.yml
packages/libtk-pod-perl/branches/upstream/current/Makefile.PL
packages/libtk-pod-perl/branches/upstream/current/Pod.pm
packages/libtk-pod-perl/branches/upstream/current/README
Log:
Load /tmp/tmp.OYA0yY/libtk-pod-perl-0.9932 into
packages/libtk-pod-perl/branches/upstream/current.
Modified: packages/libtk-pod-perl/branches/upstream/current/Changes
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Changes 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/Changes 2006-01-03 16:53:15 UTC (rev 1841)
@@ -1,5 +1,10 @@
History for Tk::Pod
+version 0.9932
+ o bugfix - Tk::Pod did not work with Tk804 and without
+ Tk::ToolBar installed (thanks to Craig Thayer for spotting
+ the problem)
+
version 0.9931
o Tk::ToolBar menu icon support also for Tk800
(very experimental!)
Modified: packages/libtk-pod-perl/branches/upstream/current/MANIFEST
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/MANIFEST 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/MANIFEST 2006-01-03 16:53:15 UTC (rev 1841)
@@ -22,6 +22,7 @@
t/pods.t
t/subclass.t
t/more.t
+t/optionalmods.t
tkmore
tkpod
META.yml
Modified: packages/libtk-pod-perl/branches/upstream/current/META.yml
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/META.yml 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/META.yml 2006-01-03 16:53:15 UTC (rev 1841)
@@ -1,15 +1,18 @@
# http://module-build.sourceforge.net/META-spec.html
-#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: Tk-Pod
-version: 0.9931
+version: 0.9932
version_from:
installdirs: site
requires:
File::Temp: 0
- Pod::Simple: 2.05
+ Pod::Simple: 0
+ Tk: 800.004
+recommends:
Text::English: 0
- Tk: 800.004
Tk::HistEntry: 0.4
-
+ Tk::ToolBar: 0
+license: perl
distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30
+resources:
+ bugtracker: http://rt.cpan.org/NoAuth/Bugs.html?Dist=Tk-Pod
+ license: http://dev.perl.org/licenses/
Modified: packages/libtk-pod-perl/branches/upstream/current/Makefile.PL
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Makefile.PL 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/Makefile.PL 2006-01-03 16:53:15 UTC (rev 1841)
@@ -2,7 +2,7 @@
use ExtUtils::MakeMaker;
-$DIST_VERSION = "0.9931";
+$DIST_VERSION = "0.9932";
$is_devel_host = defined $ENV{USER} && $ENV{USER} eq 'eserte' && $^O =~ /bsd/i && -f "../../perl.release.mk";
if ($is_devel_host) {
open(P, "Pod.pm") or die "Can't open Pod.pm: $!";
@@ -18,10 +18,13 @@
die "Cannot find DIST_VERSION definition in Pod.pm";
}
- require YAML;
- my $meta = YAML::LoadFile("META.yml");
- if ($meta->{version} ne $DIST_VERSION) {
- die "Please fix version in META.yml!\n";
+ if (!eval { require YAML; 1 }) {
+ warn "Please install YAML, otherwise no META.yml check could be done!";
+ } else {
+ my $meta = YAML::LoadFile("META.yml");
+ if ($meta->{version} ne $DIST_VERSION) {
+ die "Please fix version in META.yml!\n";
+ }
}
}
@@ -36,6 +39,7 @@
'DISTNAME' => 'Tk-Pod',
'NAME' => 'Tk::Pod',
'VERSION' => $DIST_VERSION,
+ 'NO_META' => 1,
'DIR' => [], # Tk-Pod dist build dir is ignored
Modified: packages/libtk-pod-perl/branches/upstream/current/Pod.pm
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/Pod.pm 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/Pod.pm 2006-01-03 16:53:15 UTC (rev 1841)
@@ -4,8 +4,8 @@
use Tk::Toplevel;
use vars qw($VERSION $DIST_VERSION @ISA);
-$VERSION = sprintf("%d.%02d", q$Revision: 5.7 $ =~ /(\d+)\.(\d+)/);
-$DIST_VERSION = "0.9931";
+$VERSION = sprintf("%d.%02d", q$Revision: 5.10 $ =~ /(\d+)\.(\d+)/);
+$DIST_VERSION = "0.9932";
@ISA = qw(Tk::Toplevel);
@@ -50,7 +50,7 @@
# Experimental menu compound images:
# XXX Maybe there should be a way to turn this off, as the extra
# icons might be memory consuming...
- my $compound = sub { () };
+ my $compound = sub { ($_[0]) };
if ($Tk::VERSION >= 800 && eval { require Tk::ToolBar; 1 }) {
$w->ToolBar->destroy; # hack to load images
if (!$Tk::Pod::empty_image_16) { # XXX multiple MainWindows?
@@ -680,7 +680,7 @@
sub zoom {
my($w, $method) = @_;
my $p = $w->Subwidget("pod");
- $p->$method;
+ $p->$method();
$w->set_base_font_size($p->base_font_size);
}
Modified: packages/libtk-pod-perl/branches/upstream/current/README
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/README 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/README 2006-01-03 16:53:15 UTC (rev 1841)
@@ -5,15 +5,17 @@
To install, type:
- perl Makefile.PL
+ perl Makefile.PL (resolve all dependencies)
make
make test
- make demo
+ make demo (optional)
make install
Windows users should replace "make" with "nmake" unless using a
cygwin-compiled or MinGW-compiled perl.
+At least perl 5.005 and Tk 800.004 is required.
+
Features include:
o A standalone Tk pod viewer: tkpod
o Interface to perlindex full text Pod search
Added: packages/libtk-pod-perl/branches/upstream/current/t/optionalmods.t
===================================================================
--- packages/libtk-pod-perl/branches/upstream/current/t/optionalmods.t 2006-01-02 22:57:57 UTC (rev 1840)
+++ packages/libtk-pod-perl/branches/upstream/current/t/optionalmods.t 2006-01-03 16:53:15 UTC (rev 1841)
@@ -0,0 +1,40 @@
+#!/usr/bin/perl
+# -*- perl -*-
+
+#
+# $Id: optionalmods.t,v 1.2 2005/12/29 22:34:33 eserte Exp $
+# Author: Slaven Rezic
+#
+
+use strict;
+
+BEGIN {
+ if (!eval q{
+ use Test::More;
+ require Test::Without::Module;
+ 1;
+ }) {
+ print "1..0 # skip: no Test::More and/or Test::Without::Module modules\n";
+ exit;
+ }
+}
+
+use Test::Without::Module qw(Text::English Tk::HistEntry Tk::ToolBar);
+
+use Tk;
+use Tk::Pod;
+
+plan tests => 1;
+
+my $mw = tkinit;
+$mw->geometry("+0+0");
+
+my $pod = $mw->Pod;
+$pod->idletasks;
+ok(Tk::Exists($pod));
+
+if (defined $ENV{BATCH} && !$ENV{BATCH}) {
+ MainLoop;
+}
+
+__END__
Property changes on: packages/libtk-pod-perl/branches/upstream/current/t/optionalmods.t
___________________________________________________________________
Name: svn:executable
+ *
More information about the Pkg-perl-cvs-commits
mailing list