r28820 - in /branches/upstream/libgtk2-ex-podviewer-perl/current: Makefile.PL README lib/Gtk2/Ex/PodViewer.pm lib/Gtk2/Ex/PodViewer/Parser.pm

Sun Dec 28 10:29:53 UTC 2008

Author: ryan52-guest
Date: Sun Dec 28 10:29:50 2008
New Revision: 28820

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=28820
Log:
[svn-upgrade] Integrating new upstream version, libgtk2-ex-podviewer-perl (0.18)

Modified:
    branches/upstream/libgtk2-ex-podviewer-perl/current/Makefile.PL
    branches/upstream/libgtk2-ex-podviewer-perl/current/README
    branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer.pm
    branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer/Parser.pm

Modified: branches/upstream/libgtk2-ex-podviewer-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-ex-podviewer-perl/current/Makefile.PL?rev=28820&op=diff
==============================================================================

--- branches/upstream/libgtk2-ex-podviewer-perl/current/Makefile.PL (original)
+++ branches/upstream/libgtk2-ex-podviewer-perl/current/Makefile.PL Sun Dec 28 10:29:50 2008
@@ -1,5 +1,5 @@
 #!/usr/bin/perl
-# $Id: Makefile.PL,v 1.8 2006/05/16 16:01:19 gavin Exp $
+# $Id: Makefile.PL,v 1.9 2008/10/04 14:00:24 gavin Exp $
 use ExtUtils::MakeMaker;
 use strict;
 
@@ -23,7 +23,6 @@
     	'Pod::Parser'		=> 0,
     	'IO::Scalar'		=> 0,
     	'File::Basename'	=> 0,
-    	'Locale::gettext'	=> 0,
     	'Pod::Simple::Search'	=> 0,
     },
     'EXE_FILES'			=> [ 'src/podviewer' ]

Modified: branches/upstream/libgtk2-ex-podviewer-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-ex-podviewer-perl/current/README?rev=28820&op=diff
==============================================================================
--- branches/upstream/libgtk2-ex-podviewer-perl/current/README (original)
+++ branches/upstream/libgtk2-ex-podviewer-perl/current/README Sun Dec 28 10:29:50 2008
@@ -31,7 +31,7 @@
 This program is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
 
-Copyright (C) 2004 Gavin Brown.
+Copyright (C) 2003-2008 Gavin Brown.
 
 --
-$Id: README,v 1.5 2004/09/08 09:58:26 jodrell Exp $
+$Id: README,v 1.6 2008/10/04 14:00:24 gavin Exp $

Modified: branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer.pm?rev=28820&op=diff
==============================================================================
--- branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer.pm (original)
+++ branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer.pm Sun Dec 28 10:29:50 2008
@@ -1,5 +1,5 @@
-# $Id: PodViewer.pm,v 1.44 2006/09/18 09:15:13 gavin Exp $
-# Copyright (c) 2003-2005 Gavin Brown. All rights reserved. This program is
+# $Id: PodViewer.pm,v 1.44 2008/10/04 14:01:23 gavin Exp $
+# Copyright (c) 2003-2008 Gavin Brown. All rights reserved. This program is
 # free software; you can redistribute it and/or modify it under the same
 # terms as Perl itself. 
 package Gtk2::Ex::PodViewer;
@@ -10,7 +10,7 @@
 use Pod::Simple::Search;
 use strict;
 
-our $VERSION = '0.17';
+our $VERSION = '0.18';
 
 #
 # we want to create a new signal for this object, which means we need to
@@ -309,7 +309,7 @@
 	my ($self, $name) = @_;
 	my $mark = $self->get_mark($name);
 	return undef unless (ref($mark) eq 'Gtk2::TextMark');
-	return $self->scroll_to_mark($mark, 0, 1, 0, 0);
+	return $self->scroll_to_mark($mark, undef, 1, 0, 0);
 }
 
 =pod

Modified: branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer/Parser.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer/Parser.pm?rev=28820&op=diff
==============================================================================
--- branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer/Parser.pm (original)
+++ branches/upstream/libgtk2-ex-podviewer-perl/current/lib/Gtk2/Ex/PodViewer/Parser.pm Sun Dec 28 10:29:50 2008
@@ -1,14 +1,13 @@
-# $Id: Parser.pm,v 1.25 2006/07/11 12:47:36 gavin Exp $
-# Copyright (c) 2003-2005 Gavin Brown. All rights reserved. This program is
+# $Id: Parser.pm,v 1.26 2008/10/04 14:00:24 gavin Exp $
+# Copyright (c) 2003-2008 Gavin Brown. All rights reserved. This program is
 # free software; you can redistribute it and/or modify it under the same
 # terms as Perl itself.
 package Gtk2::Ex::PodViewer::Parser;
 use base 'Pod::Parser';
 use Carp;
 use IO::Scalar;
-use vars qw(%ENTITIES $LINK_TEXT_TEMPLATE);
+use vars qw(%ENTITIES $LINK_TEXT_TEMPLATE $GETTEXT);
 use Exporter;
-use Locale::gettext;
 use bytes;
 use strict;
 
@@ -130,6 +129,12 @@
 
 our $LINK_TEXT_TEMPLATE = '{section} in the {document} manpage';
 
+our $GETTEXT = 0;
+eval qq(
+	use Locale::gettext;
+	$GETTEXT = 1;
+);
+
 =pod
 
 =head1 NAME
@@ -248,7 +253,7 @@
 								if ($doc eq '') {
 									$text = $section;
 								} else {
-									$text = gettext($LINK_TEXT_TEMPLATE);
+									$text = ($GETTEXT ? gettext($LINK_TEXT_TEMPLATE) : $LINK_TEXT_TEMPLATE);
 									$text =~ s/\{section\}/$section/g;
 									$text =~ s/\{document\}/$doc/g;
 								}
@@ -363,7 +368,7 @@
 
 	LE<lt>foo/barE<gt>
 
-This string is run through the C<gettext()> function from L<Locale::gettext> before it is used, so if your application supports internationalisation, then the string will be translated if it appears in your translation domain. It contains two tokens, C<{section}> and C<{document}>, that are replaced with C<foo> and C<bar> respectively.
+This string is run through the C<gettext()> function from L<Locale::gettext> (if installed) before it is used, so if your application supports internationalisation, then the string will be translated if it appears in your translation domain. It contains two tokens, C<{section}> and C<{document}>, that are replaced with C<foo> and C<bar> respectively.
 
 =head1 SEE ALSO
 


