Please review/apply patch attached.
Index: MANIFEST
===================================================================
--- MANIFEST (revision 27299)
+++ MANIFEST (working copy)
@@ -1,7 +1,7 @@
# ex: set ro:
# $Id$
#
-# generated by tools/dev/mk_manifest_and_skip.pl Fri May 2 18:05:05 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat May 3 01:29:24 2008 UT
#
# See tools/dev/install_files.pl for documentation on the
# format of this file.
@@ -275,7 +275,6 @@
config/auto/pcre/pcre.in []
config/auto/perldoc.pm []
config/auto/pmc.pm []
-config/auto/python.pm []
config/auto/readline.pm []
config/auto/readline/readline.in []
config/auto/revision.pm []
@@ -3505,7 +3504,6 @@
t/steps/auto_pmc-02.t []
t/steps/auto_pmc-03.t []
t/steps/auto_pmc-04.t []
-t/steps/auto_python-01.t []
t/steps/auto_readline-01.t []
t/steps/auto_readline-02.t []
t/steps/auto_revision-01.t []
Index: lib/Parrot/Configure/Step/List.pm
===================================================================
--- lib/Parrot/Configure/Step/List.pm (revision 27299)
+++ lib/Parrot/Configure/Step/List.pm (working copy)
@@ -63,7 +63,6 @@
auto::gettext
auto::snprintf
auto::perldoc
- auto::python
auto::m4
auto::ctags
auto::revision
Index: ports/debian/control.in
===================================================================
--- ports/debian/control.in (revision 27299)
+++ ports/debian/control.in (working copy)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Parrot Maintainers <[EMAIL PROTECTED]>
Uploaders: Allison Randal <[EMAIL PROTECTED]>, Nuno Carvalho <[EMAIL
PROTECTED]>, Patrick Michaud <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgmp3-dev, libgdbm-dev,
python, libicu-dev, libreadline-dev
+Build-Depends: debhelper (>= 5.0.0), perl, perl-doc, libgmp3-dev, libgdbm-dev,
libicu-dev, libreadline-dev
Standards-Version: 3.7.2
Package: parrot
Index: MANIFEST.SKIP
===================================================================
--- MANIFEST.SKIP (revision 27299)
+++ MANIFEST.SKIP (working copy)
@@ -1,6 +1,6 @@
# ex: set ro:
# $Id$
-# generated by tools/dev/mk_manifest_and_skip.pl Fri May 2 20:57:11 2008 UT
+# generated by tools/dev/mk_manifest_and_skip.pl Sat May 3 01:29:24 2008 UT
#
# This file should contain a transcript of the svn:ignore properties
# of the directories in the Parrot subversion repository. (Needed for
@@ -664,8 +664,6 @@
^languages/eclectus/Makefile/
^languages/eclectus/driver_nqp\.pbc$
^languages/eclectus/driver_nqp\.pbc/
-^languages/eclectus/gen_past\.pir$
-^languages/eclectus/gen_past\.pir/
^languages/eclectus/stst\.out$
^languages/eclectus/stst\.out/
# generated from svn:ignore of 'languages/eclectus/src/builtins/'
Index: README_win32.pod
===================================================================
--- README_win32.pod (revision 27299)
+++ README_win32.pod (working copy)
@@ -118,9 +118,6 @@
B<m4> - macro language processor
L<http://gnuwin32.sourceforge.net/>
-B<Python> - an interpreted, interactive, object-oriented programming language
-L<http://www.python.org/>
-
B<SVN::Client> - Perl wrapper of Subversion client functions
L<http://subversion.tigris.org/> (svn-win32-1.4.x_pl.zip)
Index: t/steps/auto_python-01.t
===================================================================
--- t/steps/auto_python-01.t (revision 27299)
+++ t/steps/auto_python-01.t (working copy)
@@ -1,51 +0,0 @@
-#! perl
-# Copyright (C) 2007, The Perl Foundation.
-# $Id$
-# auto_python-01.t
-
-use strict;
-use warnings;
-use Test::More tests => 2;
-use Carp;
-use lib qw( lib );
-use_ok('config::auto::python');
-
-=for hints_for_testing Try to test all branches and conditions; consult
-a recent code coverage report for guidance.
-
-=cut
-
-pass("Completed all tests in $0");
-
-################### DOCUMENTATION ###################
-
-=head1 NAME
-
-auto_python-01.t - test config::auto::python
-
-=head1 SYNOPSIS
-
- % prove t/steps/auto_python-01.t
-
-=head1 DESCRIPTION
-
-The files in this directory test functionality used by F<Configure.pl>.
-
-The tests in this file test subroutines exported by config::auto::python.
-
-=head1 AUTHOR
-
-James E Keenan
-
-=head1 SEE ALSO
-
-config::auto::python, F<Configure.pl>.
-
-=cut
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
Index: config/auto/python.pm
===================================================================
--- config/auto/python.pm (revision 27299)
+++ config/auto/python.pm (working copy)
@@ -1,67 +0,0 @@
-# Copyright (C) 2005, The Perl Foundation.
-# $Id$
-
-=head1 NAME
-
-config/auto/python - Check whether python is there
-
-=head1 DESCRIPTION
-
-Determines whether python is there. Checks also whether we have Python 2.4.
-
-=head1 TODO
-
-Store version of Python.
-
-=cut
-
-package auto::python;
-
-use strict;
-use warnings;
-
-use base qw(Parrot::Configure::Step);
-
-use Parrot::Configure::Utils ':auto';
-
-
-sub _init {
- my $self = shift;
- my %data;
- $data{description} = q{Determining whether python is installed};
- $data{result} = q{};
- return \%data;
-}
-
-sub runstep {
- my ( $self, $conf ) = @_;
-
- my ( $out, $err ) = capture_output( 'python', '-V' );
- my $output = join( '', $out || '', $err || '' );
- my ( $python, $major, $minor, $revision ) = $output =~
m/(Python)\s+(\d+).(\d+)(?:.(\d+))?/;
- $revision = 0 unless defined $revision;
- my $has_python = $python ? 1 : 0;
-
- $conf->data->set( has_python => $has_python );
-
- my $has_python_2_4 = 0;
- if ($has_python) {
- $has_python_2_4 = ( $major eq '2' && $minor eq '4' ) ? 1 : 0;
- $self->set_result("yes, $major.$minor.$revision");
- }
- else {
- $self->set_result('no');
- }
- $conf->data->set( has_python_2_4 => $has_python_2_4 );
-
- return 1;
-}
-
-1;
-
-# Local Variables:
-# mode: cperl
-# cperl-indent-level: 4
-# fill-column: 100
-# End:
-# vim: expandtab shiftwidth=4:
