r46496 - in /trunk/libterm-readline-perl-perl: CHANGES META.yml ReadLine/Perl.pm ReadLine/readline.pm debian/changelog debian/compat debian/control debian/rules test.pl
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Oct 29 02:22:07 UTC 2009
Author: jawnsy-guest
Date: Thu Oct 29 02:22:01 2009
New Revision: 46496
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=46496
Log:
* New upstream release
* Standards-Version 3.8.3 (drop perl version dependency)
* Add myself to Uploaders
* Rewrite control description
* Use new short debhelper rules format
Added:
trunk/libterm-readline-perl-perl/META.yml
- copied unchanged from r46495, branches/upstream/libterm-readline-perl-perl/current/META.yml
Modified:
trunk/libterm-readline-perl-perl/CHANGES
trunk/libterm-readline-perl-perl/ReadLine/Perl.pm
trunk/libterm-readline-perl-perl/ReadLine/readline.pm
trunk/libterm-readline-perl-perl/debian/changelog
trunk/libterm-readline-perl-perl/debian/compat
trunk/libterm-readline-perl-perl/debian/control
trunk/libterm-readline-perl-perl/debian/rules
trunk/libterm-readline-perl-perl/test.pl
Modified: trunk/libterm-readline-perl-perl/CHANGES
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/CHANGES?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/CHANGES (original)
+++ trunk/libterm-readline-perl-perl/CHANGES Thu Oct 29 02:22:01 2009
@@ -210,3 +210,13 @@
if $inDOS too.
Bind C-x @ c and C-x @ m too (as in Emacs).
+1.0303: Would not allow macros with space in them.
+ Never try to display the whole prompt unless it is shorter than
+ screen width ;-).
+ Test supports PERL_RL_TEST_PROMPT_MINLEN in environment.
+ Test hints at special significance of the word `exit'.
+ Avoid a warning on unexpected variable assign (thanks to Robin Barker).
+ Change error message for unknown method.
+ Protect global variables during WINCH processing.
+ F_ReverseSearchHistory was not -w-safe (thanks to Peter Valdemar)
+ Test for $ENV{PERL_MM_NONINTERACTIVE} also to abort tests.
Modified: trunk/libterm-readline-perl-perl/ReadLine/Perl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/ReadLine/Perl.pm?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/ReadLine/Perl.pm (original)
+++ trunk/libterm-readline-perl-perl/ReadLine/Perl.pm Thu Oct 29 02:22:01 2009
@@ -3,7 +3,7 @@
@ISA = qw(Term::ReadLine::Stub Term::ReadLine::Compa Term::ReadLine::Perl::AU);
#require 'readline.pl';
-$VERSION = $VERSION = 1.0302;
+$VERSION = $VERSION = 1.0303;
sub readline {
shift;
@@ -117,7 +117,7 @@
sub AUTOLOAD {
{ $AUTOLOAD =~ s/.*:://; } # preserve match data
my $name = "readline::rl_$AUTOLOAD";
- die "Cannot do `$AUTOLOAD' in Term::ReadLine::Perl"
+ die "Unknown method `$AUTOLOAD' in Term::ReadLine::Perl"
unless exists $readline::{"rl_$AUTOLOAD"};
*$AUTOLOAD = sub { shift; &$name };
goto &$AUTOLOAD;
Modified: trunk/libterm-readline-perl-perl/ReadLine/readline.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/ReadLine/readline.pm?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/ReadLine/readline.pm (original)
+++ trunk/libterm-readline-perl-perl/ReadLine/readline.pm Thu Oct 29 02:22:01 2009
@@ -52,7 +52,7 @@
## while writing this), and for Roland Schemers whose line_edit.pl I used
## as an early basis for this.
##
-$VERSION = $VERSION = '1.0302';
+$VERSION = $VERSION = '1.0303';
## - Changes from Slaven Rezic (slaven at rezic.de):
## * reverted the usage of $ENV{EDITOR} to set startup mode
@@ -403,6 +403,7 @@
sub get_window_size
{
my $sig = shift;
+ local($., $@, $!, $^E, $?); # Preserve $! etc; the rest for hooks
my ($num_cols,$num_rows);
if (defined $term_readkey) {
@@ -1438,7 +1439,7 @@
&rl_set($1, $2, $file);
} elsif (m/^\s*(\S+):\s+("(?:\\.|[^\\\"])*"|'(\\.|[^\\\'])*')/) { # Allow trailing comment
&rl_bind($1, $2);
- } elsif (m/^\s*(\S+):\s+(\S+)/) { # Allow trailing comment
+ } elsif (m/^\s*(\S+|"[^\"]+"):\s+(\S+)/) { # Allow trailing comment
&rl_bind($1, $2);
} else {
chomp;
@@ -1909,7 +1910,8 @@
}
##
- ## Now $dline is what we'd like to display.
+ ## Now $dline is what we'd like to display (with a prepended prompt)
+ ## $D is the position of the cursor on it.
##
## If it's too long to fit on the line, we must decide what we can fit.
##
@@ -1924,13 +1926,15 @@
## Similarly, if the line needs chopped off, we make sure that the
## placement of the tailing '>' won't screw up any 2-byte character in
## the vicinity.
- ##
- if ($D == length($prompt)) {
- $si = 0; ## display from the beginning....
- } elsif ($si >= $D) { # point to the left
+
+ # Now $si keeps the value from previous display
+ if ($D == length($prompt) # If prompts fits exactly, show only if need not show trailing '>'
+ and length($prompt) < $rl_screen_width - (0 != length $dline)) {
+ $si = 0; ## prefer displaying the whole prompt
+ } elsif ($si >= $D) { # point to the left of what was displayed
$si = &max(0, $D - $rl_margin);
$si-- if $si > 0 && $si != length($prompt) && !&OnSecondByte($si);
- } elsif ($si + $rl_screen_width <= $D) { # Point to the right
+ } elsif ($si + $rl_screen_width <= $D) { # Point to the right of ...
$si = &min(length($dline), ($D - $rl_screen_width) + $rl_margin);
$si-- if $si > 0 && $si != length($prompt) && !&OnSecondByte($si);
} elsif (length($dline) - $si < $rl_screen_width - $rl_margin and $si) {
@@ -1957,7 +1961,7 @@
##
$dline = substr($dline, $si, $thislen);
$delta = $D - $si; ## delta is cursor distance from beginning of $dline.
- if (defined $bsel) {
+ if (defined $bsel) { # Highlight the selected part
$bsel -= $si;
$esel = $delta;
($bsel, $esel) = ($esel, $bsel) if $bsel > $esel;
@@ -2346,7 +2350,8 @@
# Skip unknown variables:
return unless defined $ {'readline::'}{"var_$_"};
- local(*V) = $ {'readline::'}{"var_$_"};
+ local(*V); # avoid <Undefined value assign to typeglob> warning
+ { local $^W; *V = $ {'readline::'}{"var_$_"}; }
if (!defined($V)) { # XXX Duplicate check?
warn("Warning$InputLocMsg:\n".
" Invalid variable `$var'\n") if $^W;
@@ -2904,7 +2909,7 @@
&redisplay( '('.($reverse?'reverse-':'') ."i-search) `$searchstr': ");
$c = &getc_with_pending;
- if ($KeyMap[ord($c)] eq 'F_ReverseSearchHistory') {
+ if (($KeyMap[ord($c)] || 0) eq 'F_ReverseSearchHistory') {
if ($reverse && $I != -1) {
if ($tmp = &search($I-1,$searchstr), $tmp >= 0) {
$I = $tmp;
@@ -2913,7 +2918,7 @@
}
}
$reverse = 1;
- } elsif ($KeyMap[ord($c)] eq 'F_ForwardSearchHistory') {
+ } elsif (($KeyMap[ord($c)] || 0) eq 'F_ForwardSearchHistory') {
if (!$reverse && $I != -1) {
if ($tmp = &search($I+1,$searchstr), $tmp >= 0) {
$I = $tmp;
Modified: trunk/libterm-readline-perl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/debian/changelog?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/debian/changelog (original)
+++ trunk/libterm-readline-perl-perl/debian/changelog Thu Oct 29 02:22:01 2009
@@ -1,4 +1,11 @@
-libterm-readline-perl-perl (1.0302-2) UNRELEASED; urgency=low
+libterm-readline-perl-perl (1.0303-1) UNRELEASED; urgency=low
+
+ [ Jonathan Yu ]
+ * New upstream release
+ * Standards-Version 3.8.3 (drop perl version dependency)
+ * Add myself to Uploaders
+ * Rewrite control description
+ * Use new short debhelper rules format
[ gregor herrmann ]
* debian/control: Added: Vcs-Svn field (source stanza); Vcs-Browser
@@ -17,7 +24,7 @@
[ Nathan Handler ]
* debian/watch: Update to ignore development releases.
- -- gregor herrmann <gregor+debian at comodo.priv.at> Tue, 09 Oct 2007 22:32:21 +0200
+ -- Jonathan Yu <jawnsy at cpan.org> Wed, 28 Oct 2009 18:46:51 -0400
libterm-readline-perl-perl (1.0302-1) unstable; urgency=low
Modified: trunk/libterm-readline-perl-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/debian/compat?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/debian/compat (original)
+++ trunk/libterm-readline-perl-perl/debian/compat Thu Oct 29 02:22:01 2009
@@ -1,1 +1,1 @@
-5
+7
Modified: trunk/libterm-readline-perl-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/debian/control?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/debian/control (original)
+++ trunk/libterm-readline-perl-perl/debian/control Thu Oct 29 02:22:01 2009
@@ -1,11 +1,12 @@
Source: libterm-readline-perl-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 5.0.0)
-Build-Depends-Indep: perl (>= 5.6.0-17)
+Build-Depends: debhelper (>= 7)
+Build-Depends-Indep: perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
-Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>, Krzysztof Krzyzaniak (eloy) <eloy at debian.org>
-Standards-Version: 3.7.2
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Niko Tyni <ntyni at iki.fi>,
+ Krzysztof Krzyzaniak (eloy) <eloy at debian.org>, Jonathan Yu <jawnsy at cpan.org>
+Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/Term-ReadLine-Perl/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libterm-readline-perl-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libterm-readline-perl-perl/
@@ -14,9 +15,8 @@
Architecture: all
Depends: libterm-readkey-perl, ${perl:Depends}, ${misc:Depends}
Description: Perl implementation of Readline libraries
- This is a quick implementation of the minimal interface to Readline
- libraries. The implementation is made in Perl (mostly) by Jeffrey
- Friedl. The only thing this library does is to make it conformant (and
- add some minimal changes, like using Term::ReadKey if present, and
- correct work under xterm).
-
+ Term::ReadLine::Perl is a quick implementation of the minimal interface to
+ Readline libraries. The implementation is made in Perl (mostly) by Jeffrey
+ Friedl. The only thing this library does is to make it conformant (and add
+ some minimal changes, like using Term::ReadKey if present, and correct work
+ under xterm).
Modified: trunk/libterm-readline-perl-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/debian/rules?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/debian/rules (original)
+++ trunk/libterm-readline-perl-perl/debian/rules Thu Oct 29 02:22:01 2009
@@ -1,64 +1,4 @@
#!/usr/bin/make -f
-#-*- makefile -*-
-#export DH_VERBOSE=1
-export PERL_MM_USE_DEFAULT=1
-
-PACKAGE=libterm-readline-perl-perl
-
-ifndef PERL
-PERL = /usr/bin/perl
-endif
-
-ifndef DESTDIR
-DESTDIR=..
-endif
-TMP = $(CURDIR)/debian/$(PACKAGE)
-
-build: build-stamp
-build-stamp:
- dh_testdir
-
- $(PERL) Makefile.PL INSTALLDIRS=vendor
- $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
- [ ! -f Makefile ] || $(MAKE) realclean
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
- #--- $(MAKE) test - don't activate - it's interactive
- $(MAKE) install PREFIX=$(TMP)/usr
- [ ! -d $(TMP)/usr/lib/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/lib/perl5
-
-
-binary-arch: build install
-# We have nothing to do.
-
-binary-indep: build install
- dh_testdir
- dh_testroot
- dh_installdocs README
- dh_installman
- dh_installchangelogs CHANGES
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_perl
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb --destdir=$(DESTDIR)
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
+%:
+ dh $@
Modified: trunk/libterm-readline-perl-perl/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libterm-readline-perl-perl/test.pl?rev=46496&op=diff
==============================================================================
--- trunk/libterm-readline-perl-perl/test.pl (original)
+++ trunk/libterm-readline-perl-perl/test.pl Thu Oct 29 02:22:01 2009
@@ -9,8 +9,9 @@
use Carp;
$SIG{__WARN__} = sub { warn Carp::longmess(@_) };
-if ($ENV{AUTOMATED_TESTING}) {
- print "1..0 # skip: \$ENV{AUTOMATED_TESTING} is TRUE\n";
+my $ev;
+if ($ENV{$ev = 'AUTOMATED_TESTING'} or $ENV{$ev = 'PERL_MM_NONINTERACTIVE'}) {
+ print "1..0 # skip: \$ENV{$ev} is TRUE\n";
exit;
}
@@ -29,6 +30,9 @@
$no_print = $ARGV[0] eq '--no-print';
}
$prompt = "Enter arithmetic or Perl expression: ";
+if ((my $l = $ENV{PERL_RL_TEST_PROMPT_MINLEN} | 0) > length $prompt) {
+ $prompt =~ s/(?=:)/ ' ' x ($l - length $prompt)/e;
+}
$OUT = $term->OUT || STDOUT;
%features = %{ $term->Features };
if (%features) {
@@ -38,7 +42,15 @@
} else {
print $OUT "No additional features present.\n";
}
-print $OUT "Flipping rl_default_selected each line.\n";
+print $OUT "\n Flipping rl_default_selected each line.\n";
+print $OUT <<EOP;
+
+ Hint: Entering the word
+ exit
+ would exit the test. ;-) (If feature 'preput' is present,
+ this word should be already entered.)
+
+EOP
while ( defined ($_ = $term->readline($prompt, "exit")) ) {
$res = eval($_);
warn $@ if $@;
More information about the Pkg-perl-cvs-commits
mailing list