r55324 - in /branches/upstream/libtext-markdown-perl/current: Changes MANIFEST META.yml Makefile.PL inc/Module/Install/Base.pm inc/Module/Install/CheckConflicts.pm inc/Module/Install/Scripts.pm lib/Text/Markdown.pm
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Apr 3 02:49:34 UTC 2010
Author: jawnsy-guest
Date: Sat Apr 3 02:49:27 2010
New Revision: 55324
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=55324
Log:
[svn-upgrade] Integrating new upstream version, libtext-markdown-perl (1.000031)
Added:
branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Scripts.pm
Modified:
branches/upstream/libtext-markdown-perl/current/Changes
branches/upstream/libtext-markdown-perl/current/MANIFEST
branches/upstream/libtext-markdown-perl/current/META.yml
branches/upstream/libtext-markdown-perl/current/Makefile.PL
branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Base.pm
branches/upstream/libtext-markdown-perl/current/inc/Module/Install/CheckConflicts.pm
branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm
Modified: branches/upstream/libtext-markdown-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Changes?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Changes (original)
+++ branches/upstream/libtext-markdown-perl/current/Changes Sat Apr 3 02:49:27 2010
@@ -1,4 +1,7 @@
This file documents the revision history for Perl extension Text::Markdown.
+
+1.0.31 2010-03-20T23:06:04
+ - Fix installation of the Markdown.pl script.
1.0.30 2010-01-18T12:19:49
- Removed File::Slurp dependency (v. 9999.13 fails tests on
Modified: branches/upstream/libtext-markdown-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/MANIFEST?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/MANIFEST (original)
+++ branches/upstream/libtext-markdown-perl/current/MANIFEST Sat Apr 3 02:49:27 2010
@@ -6,6 +6,7 @@
inc/Module/Install/Fetch.pm
inc/Module/Install/Makefile.pm
inc/Module/Install/Metadata.pm
+inc/Module/Install/Scripts.pm
inc/Module/Install/Win32.pm
inc/Module/Install/WriteAll.pm
lib/Text/Markdown.pm
Modified: branches/upstream/libtext-markdown-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/META.yml?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/META.yml (original)
+++ branches/upstream/libtext-markdown-perl/current/META.yml Sat Apr 3 02:49:27 2010
@@ -12,7 +12,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 0.91'
+generated_by: 'Module::Install version 0.910'
license: bsd
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -31,4 +31,4 @@
bugtracker: http://github.com/bobtfish/text-markdown/issues
license: http://opensource.org/licenses/bsd-license.php
repository: http://github.com/bobtfish/text-markdown/
-version: 1.000030
+version: 1.000031
Modified: branches/upstream/libtext-markdown-perl/current/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/Makefile.PL?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/Makefile.PL (original)
+++ branches/upstream/libtext-markdown-perl/current/Makefile.PL Sat Apr 3 02:49:27 2010
@@ -31,7 +31,7 @@
'Text::MultiMarkdown' => '1.0.27',
);
-# Scripts I install
-prompt_script('script/Markdown.pl');
+install_script 'script/Markdown.pl';
WriteAll;
+
Modified: branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Base.pm?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Base.pm (original)
+++ branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Base.pm Sat Apr 3 02:49:27 2010
@@ -9,8 +9,8 @@
# Suspend handler for "redefined" warnings
BEGIN {
- my $w = $SIG{__WARN__};
- $SIG{__WARN__} = sub { $w };
+# my $w = $SIG{__WARN__};
+# $SIG{__WARN__} = sub { $w };
}
#line 42
@@ -70,7 +70,7 @@
# Restore warning handler
BEGIN {
- $SIG{__WARN__} = $SIG{__WARN__}->();
+# $SIG{__WARN__} = $SIG{__WARN__}->();
}
1;
Modified: branches/upstream/libtext-markdown-perl/current/inc/Module/Install/CheckConflicts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/inc/Module/Install/CheckConflicts.pm?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/inc/Module/Install/CheckConflicts.pm (original)
+++ branches/upstream/libtext-markdown-perl/current/inc/Module/Install/CheckConflicts.pm Sat Apr 3 02:49:27 2010
@@ -12,8 +12,10 @@
}
sub check_conflicts {
- my ($self, %conflicts) = @_;
-
+ my $self = shift;
+ # Deal with the fact that prompt_script calls us with just the script
+ # name by totally ignoring it. HACK!
+ my %conflicts = @_ unless scalar(@_) == 1;
my %conflicts_found;
for my $mod (sort keys %conflicts) {
next unless $self->can_use($mod);
@@ -62,4 +64,4 @@
__END__
-#line 122
+#line 124
Added: branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Scripts.pm?rev=55324&op=file
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Scripts.pm (added)
+++ branches/upstream/libtext-markdown-perl/current/inc/Module/Install/Scripts.pm Sat Apr 3 02:49:27 2010
@@ -1,0 +1,29 @@
+#line 1
+package Module::Install::Scripts;
+
+use strict 'vars';
+use Module::Install::Base ();
+
+use vars qw{$VERSION @ISA $ISCORE};
+BEGIN {
+ $VERSION = '0.91';
+ @ISA = 'Module::Install::Base';
+ $ISCORE = 1;
+}
+
+sub install_script {
+ my $self = shift;
+ my $args = $self->makemaker_args;
+ my $exe = $args->{EXE_FILES} ||= [];
+ foreach ( @_ ) {
+ if ( -f $_ ) {
+ push @$exe, $_;
+ } elsif ( -d 'script' and -f "script/$_" ) {
+ push @$exe, "script/$_";
+ } else {
+ die("Cannot find script '$_'");
+ }
+ }
+}
+
+1;
Modified: branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm?rev=55324&op=diff
==============================================================================
--- branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm (original)
+++ branches/upstream/libtext-markdown-perl/current/lib/Text/Markdown.pm Sat Apr 3 02:49:27 2010
@@ -9,7 +9,7 @@
use Carp qw(croak);
use base 'Exporter';
-our $VERSION = '1.000030'; # 1.0.30
+our $VERSION = '1.000031'; # 1.0.31
$VERSION = eval $VERSION;
our @EXPORT_OK = qw(markdown);
More information about the Pkg-perl-cvs-commits
mailing list