r4663 - in /packages/libtext-shellwords-perl/trunk: MANIFEST META.yml README Shellwords.pm debian/changelog debian/control test.pl

gwolf at users.alioth.debian.org gwolf at users.alioth.debian.org
Thu Dec 28 22:42:06 CET 2006


Author: gwolf
Date: Thu Dec 28 22:42:06 2006
New Revision: 4663

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=4663
Log:
Ready to upload new version

Added:
    packages/libtext-shellwords-perl/trunk/META.yml
      - copied unchanged from r4662, packages/libtext-shellwords-perl/branches/upstream/current/META.yml
Modified:
    packages/libtext-shellwords-perl/trunk/MANIFEST
    packages/libtext-shellwords-perl/trunk/README
    packages/libtext-shellwords-perl/trunk/Shellwords.pm
    packages/libtext-shellwords-perl/trunk/debian/changelog
    packages/libtext-shellwords-perl/trunk/debian/control
    packages/libtext-shellwords-perl/trunk/test.pl

Modified: packages/libtext-shellwords-perl/trunk/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtext-shellwords-perl/trunk/MANIFEST?rev=4663&op=diff
==============================================================================
--- packages/libtext-shellwords-perl/trunk/MANIFEST (original)
+++ packages/libtext-shellwords-perl/trunk/MANIFEST Thu Dec 28 22:42:06 2006
@@ -4,3 +4,4 @@
 README
 Shellwords.pm
 test.pl
+META.yml                                 Module meta-data (added by MakeMaker)

Modified: packages/libtext-shellwords-perl/trunk/README
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtext-shellwords-perl/trunk/README?rev=4663&op=diff
==============================================================================
--- packages/libtext-shellwords-perl/trunk/README (original)
+++ packages/libtext-shellwords-perl/trunk/README Thu Dec 28 22:42:06 2006
@@ -1,4 +1,4 @@
-Text/Shellwords version 1.00
+Text/Shellwords version 1.08
 ============================
 
 This is a thin wrapper around the shellwords.pl package, which comes

Modified: packages/libtext-shellwords-perl/trunk/Shellwords.pm
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtext-shellwords-perl/trunk/Shellwords.pm?rev=4663&op=diff
==============================================================================
--- packages/libtext-shellwords-perl/trunk/Shellwords.pm (original)
+++ packages/libtext-shellwords-perl/trunk/Shellwords.pm Thu Dec 28 22:42:06 2006
@@ -5,24 +5,27 @@
 use strict;
 require Exporter;
 
+use Text::ParseWords();
+
+
 use vars qw(@ISA @EXPORT $VERSION);
 @ISA = 'Exporter';
-$VERSION = '1.03';
+$VERSION = '1.08';
 
 @EXPORT = qw(shellwords);
 
 sub shellwords {
-  my @args = @_          ? @_
-            : defined $_ ? $_
-	    : ();
+  my @args = @_;
   return unless @args;
-  Text::Shellwords::Raw::shellwords(map {$_||''} @args); # prevent uninit variable warnings from shellwords.pl
+  foreach(@args) {
+    $_ = '' unless defined $_;
+    s/^\s+//;
+    s/\s+$//;
+  }
+  Text::ParseWords::shellwords(@args);
 }
 
 1;
-
-package Text::Shellwords::Raw;
-require 'shellwords.pl';
 
 __END__
 
@@ -35,9 +38,15 @@
   use Text::Shellwords;
   @words = shellwords($line);
   @words = shellwords(@lines);
-  @words = shellwords();
 
 =head1 DESCRIPTION
+
+This used to be a wrapper around shellwords.pl, but has now been
+superseded by Text::ParseWords.  Use that module insteade.  If you
+use this module, it will simply report the shellwords() function from
+Text::ParseWords.
+
+The old description follows:
 
 This is a thin wrapper around the shellwords.pl package, which comes
 preinstalled with Perl.  This module imports a single subroutine,
@@ -48,9 +57,10 @@
 respects backslash escapes.
 
 If called with one or more arguments, shellwords() will treat each
-argument as a line of text, parse it, and return the tokens.  If
-called without any arguments, shellwords() will parse B<$_> and
-clobber it.
+argument as a line of text, parse it, and return the tokens.
+
+Note that the old behavior of parsing $_ if no arguments are provided
+is no longer supported. Sorry.
 
 =head1 BUGS
 

Modified: packages/libtext-shellwords-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtext-shellwords-perl/trunk/debian/changelog?rev=4663&op=diff
==============================================================================
--- packages/libtext-shellwords-perl/trunk/debian/changelog (original)
+++ packages/libtext-shellwords-perl/trunk/debian/changelog Thu Dec 28 22:42:06 2006
@@ -1,3 +1,14 @@
+libtext-shellwords-perl (1.08-1) unstable; urgency=low
+
+  * New upstream release
+  * Adopted by the Debian Pkg-perl Group (Closes: #400368)
+  * Bumped up debhelper version to 5, standards-version to 3.7.2.2
+  * Our group does not really like cdbs. Building with a regular
+    debian/rules ;-)
+  * Updated debian/watch to track the module by name, not by author
+
+ -- Gunnar Wolf <gwolf at debian.org>  Thu, 28 Dec 2006 15:40:53 -0600
+
 libtext-shellwords-perl (1.03-2) unstable; urgency=low
 
   * QA upload.

Modified: packages/libtext-shellwords-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtext-shellwords-perl/trunk/debian/control?rev=4663&op=diff
==============================================================================
--- packages/libtext-shellwords-perl/trunk/debian/control (original)
+++ packages/libtext-shellwords-perl/trunk/debian/control Thu Dec 28 22:42:06 2006
@@ -5,7 +5,7 @@
 Build-Depends-Indep: perl (>= 5.8.0)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Gunnar Wolf <gwolf at debian.org>
-Standards-Version: 3.7.2
+Standards-Version: 3.7.2.2
 
 Package: libtext-shellwords-perl
 Architecture: all

Modified: packages/libtext-shellwords-perl/trunk/test.pl
URL: http://svn.debian.org/wsvn/pkg-perl/packages/libtext-shellwords-perl/trunk/test.pl?rev=4663&op=diff
==============================================================================
--- packages/libtext-shellwords-perl/trunk/test.pl (original)
+++ packages/libtext-shellwords-perl/trunk/test.pl Thu Dec 28 22:42:06 2006
@@ -6,7 +6,7 @@
 # change 'tests => 1' to 'tests => last_test_to_print';
 
 use Test;
-BEGIN { plan tests => 7 };
+BEGIN { plan tests => 6 };
 use Text::Shellwords;
 ok(1); # If we made it this far, we're ok.
 
@@ -19,6 +19,4 @@
 ok(join(',',shellwords('one\ two three')),'one two,three');
 ok(join(',',shellwords('"one two" three')),'one two,three');
 ok(join(',',shellwords(qq(one two\tthree))),'one,two,three');
-$_ = 'one two three';
-ok(join(',',shellwords),'one,two,three');
 ok(join(',',shellwords('one two three',' four five six')),'one,two,three,four,five,six');




More information about the Pkg-perl-cvs-commits mailing list