r66636 - in /trunk/liblingua-en-inflect-perl: ./ debian/ debian/patches/ debian/source/ lib/Lingua/EN/ t/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Thu Dec 30 01:13:35 UTC 2010
Author: jawnsy-guest
Date: Thu Dec 30 01:13:01 2010
New Revision: 66636
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=66636
Log:
looks good, dch -r
Added:
trunk/liblingua-en-inflect-perl/Build.PL
- copied unchanged from r66635, branches/upstream/liblingua-en-inflect-perl/current/Build.PL
trunk/liblingua-en-inflect-perl/debian/source/
trunk/liblingua-en-inflect-perl/debian/source/format
Removed:
trunk/liblingua-en-inflect-perl/Build.pl
trunk/liblingua-en-inflect-perl/debian/README.source
Modified:
trunk/liblingua-en-inflect-perl/Changes
trunk/liblingua-en-inflect-perl/MANIFEST
trunk/liblingua-en-inflect-perl/META.yml
trunk/liblingua-en-inflect-perl/README
trunk/liblingua-en-inflect-perl/debian/changelog
trunk/liblingua-en-inflect-perl/debian/control
trunk/liblingua-en-inflect-perl/debian/copyright
trunk/liblingua-en-inflect-perl/debian/patches/fix-pod-errors.patch
trunk/liblingua-en-inflect-perl/debian/rules
trunk/liblingua-en-inflect-perl/lib/Lingua/EN/Inflect.pm
trunk/liblingua-en-inflect-perl/t/inflections.t
trunk/liblingua-en-inflect-perl/t/wordlist.t
Modified: trunk/liblingua-en-inflect-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/Changes?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/Changes (original)
+++ trunk/liblingua-en-inflect-perl/Changes Thu Dec 30 01:13:01 2010
@@ -187,3 +187,8 @@
'is/am/are/was/were/have/had/alibi/hoe' (thanks Paul)
- Fixed pluralization of verb "quizzes" (thanks Paul)
+
+
+1.893 Thu Nov 4 06:24:06 2010
+
+ - Fixed major glitch in WORDLIST (thanks calimo)
Modified: trunk/liblingua-en-inflect-perl/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/MANIFEST?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/MANIFEST (original)
+++ trunk/liblingua-en-inflect-perl/MANIFEST Thu Dec 30 01:13:01 2010
@@ -1,6 +1,6 @@
Changes
MANIFEST
-Build.pl
+Build.PL
Makefile.PL
README
demo/demo_NO.pl
Modified: trunk/liblingua-en-inflect-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/META.yml?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/META.yml (original)
+++ trunk/liblingua-en-inflect-perl/META.yml Thu Dec 30 01:13:01 2010
@@ -1,6 +1,6 @@
--- #YAML:1.0
name: Lingua-EN-Inflect
-version: 1.892
+version: 1.893
abstract: Convert singular to plural. Select "a" or "an".
license: ~
author:
Modified: trunk/liblingua-en-inflect-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/README?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/README (original)
+++ trunk/liblingua-en-inflect-perl/README Thu Dec 30 01:13:01 2010
@@ -1,4 +1,4 @@
-Lingua::EN::Inflect version 1.892
+Lingua::EN::Inflect version 1.893
The exportable subroutines of Lingua::EN::Inflect provide plural
inflections and "a"/"an" selection for English words.
Modified: trunk/liblingua-en-inflect-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/debian/changelog?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/debian/changelog (original)
+++ trunk/liblingua-en-inflect-perl/debian/changelog Thu Dec 30 01:13:01 2010
@@ -1,8 +1,16 @@
-liblingua-en-inflect-perl (1.892-2) UNRELEASED; urgency=low
+liblingua-en-inflect-perl (1.893-1) unstable; urgency=low
+ [ Jonathan Yu ]
+ * New upstream release
+ * Use new 3.0 (quilt) source format
+ * Refresh quilt patch
+ * Drop overrides; Build.pl is gone
+ * Standards-Version 3.9.1 (no changes)
+
+ [ gregor herrmann ]
* debian/rules: switch order of arguments to dh.
- -- gregor herrmann <gregoa at debian.org> Wed, 28 Jul 2010 14:32:50 -0400
+ -- Jonathan Yu <jawnsy at cpan.org> Wed, 29 Dec 2010 20:28:27 -0500
liblingua-en-inflect-perl (1.892-1) unstable; urgency=low
Modified: trunk/liblingua-en-inflect-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/debian/control?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/debian/control (original)
+++ trunk/liblingua-en-inflect-perl/debian/control Thu Dec 30 01:13:01 2010
@@ -1,11 +1,11 @@
Source: liblingua-en-inflect-perl
Section: perl
Priority: optional
-Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 7)
Build-Depends-Indep: perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Jonathan Yu <jawnsy at cpan.org>, Jose Luis Rivas <ghostbar at debian.org>
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Homepage: http://search.cpan.org/dist/Lingua-EN-Inflect/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/liblingua-en-inflect-perl/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/liblingua-en-inflect-perl/
Modified: trunk/liblingua-en-inflect-perl/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/debian/copyright?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/debian/copyright (original)
+++ trunk/liblingua-en-inflect-perl/debian/copyright Thu Dec 30 01:13:01 2010
@@ -1,30 +1,30 @@
-Format-Specification:
- http://wiki.debian.org/Proposals/CopyrightFormat?action=recall&rev=196
-Upstream-Maintainer: Damian Conway <damian at conway.org>
-Upstream-Source: http://search.cpan.org/dist/Lingua-EN-Inflect/
-Upstream-Name: Lingua-EN-Inflect
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: Damian Conway <dconway at cpan.org>
+Source: http://search.cpan.org/dist/Lingua-EN-Inflect/
+Name: Lingua-EN-Inflect
Files: *
-Copyright: 1997-2000, Damian Conway <damian at conway.org>
-License-Alias: Perl
-License: Artistic | GPL-1+
+Copyright: 1997-2009, Damian Conway <dconway at cpan.org>
+License: Artistic or GPL-1+
Files: debian/*
-Copyright: 2009, Jonathan Yu <jawnsy at cpan.org>
+Copyright: 2009-2010, Jonathan Yu <jawnsy at cpan.org>
+ 2010, Jose Luis Rivas <ghostbar at debian.org>
2002-2007, Joey Hess <joeyh at debian.org>
-License: Artistic | GPL-1+
+License: Artistic or GPL-1+
License: Artistic
- This program is free software; you can redistribute it and/or modify
- it under the terms of the Artistic License, which comes with Perl.
- On Debian GNU/Linux systems, the complete text of the Artistic License
- can be found in `/usr/share/common-licenses/Artistic'
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
License: GPL-1+
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 1, or (at your option)
- any later version.
- On Debian GNU/Linux systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL'
-
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
Modified: trunk/liblingua-en-inflect-perl/debian/patches/fix-pod-errors.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/debian/patches/fix-pod-errors.patch?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/debian/patches/fix-pod-errors.patch (original)
+++ trunk/liblingua-en-inflect-perl/debian/patches/fix-pod-errors.patch Thu Dec 30 01:13:01 2010
@@ -4,7 +4,7 @@
Forwarded: no
--- a/lib/Lingua/EN/Inflect.pm
+++ b/lib/Lingua/EN/Inflect.pm
-@@ -2715,6 +2715,7 @@
+@@ -2740,6 +2740,7 @@
The problem is that C<NUMWORDS> doesn't know any
words for number components bigger than "decillion".
Modified: trunk/liblingua-en-inflect-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/debian/rules?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/debian/rules (original)
+++ trunk/liblingua-en-inflect-perl/debian/rules Thu Dec 30 01:13:01 2010
@@ -1,11 +1,4 @@
#!/usr/bin/make -f
-PACKAGE = $(shell dh_listpackages)
-TMP = $(CURDIR)/debian/$(PACKAGE)
-
%:
- dh $@ --with quilt
-
-override_dh_auto_install:
- dh_auto_install
- $(RM) -v $(TMP)/usr/share/perl5/Lingua/EN/Build.pl
+ dh $@
Added: trunk/liblingua-en-inflect-perl/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/debian/source/format?rev=66636&op=file
==============================================================================
--- trunk/liblingua-en-inflect-perl/debian/source/format (added)
+++ trunk/liblingua-en-inflect-perl/debian/source/format Thu Dec 30 01:13:01 2010
@@ -1,0 +1,1 @@
+3.0 (quilt)
Modified: trunk/liblingua-en-inflect-perl/lib/Lingua/EN/Inflect.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/lib/Lingua/EN/Inflect.pm?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/lib/Lingua/EN/Inflect.pm (original)
+++ trunk/liblingua-en-inflect-perl/lib/Lingua/EN/Inflect.pm Thu Dec 30 01:13:01 2010
@@ -7,7 +7,7 @@
require Exporter;
@ISA = qw(Exporter);
-our $VERSION = '1.892';
+our $VERSION = '1.893';
%EXPORT_TAGS =
(
@@ -1622,14 +1622,14 @@
: q{, }
;
- my $final_sep = !exists $opt{final_sep} ? "$sep $conj"
+ my $final_sep = !exists $opt{final_sep} ? "$sep $conj"
: length($opt{final_sep}) == 0 ? $conj
- : "$opt{final_sep} $conj"
+ : "$opt{final_sep} $conj"
;
$final_sep =~ s/\s+/ /gmxs;
$final_sep =~ s/^ (?=[^\W\d_]) | (?<=[^\W\d_]) $/ /gxms;
- return join($sep, @words[0, at words-2]) . "$final_sep$words[-1]";
+ return join($sep, @words[0.. at words-2]) . "$final_sep$words[-1]";
}
@@ -1644,7 +1644,7 @@
=head1 VERSION
-This document describes version 1.892 of Lingua::EN::Inflect
+This document describes version 1.893 of Lingua::EN::Inflect
=head1 SYNOPSIS
Modified: trunk/liblingua-en-inflect-perl/t/inflections.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/t/inflections.t?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/t/inflections.t (original)
+++ trunk/liblingua-en-inflect-perl/t/inflections.t Thu Dec 30 01:13:01 2010
@@ -14,77 +14,77 @@
my $count = 2;
sub ok($;$$)
{
- my $ok = $_[0];
- print "not " unless $ok;
- print "ok $count";
- print "\t# $_[1]" if $_[1];
- print " -> $_[2]" if $_[2];
- print "\n";
- $count++;
- return $ok;
+ my $ok = $_[0];
+ print "not " unless $ok;
+ print "ok $count";
+ print "\t# $_[1]" if $_[1];
+ print " -> $_[2]" if $_[2];
+ print "\n";
+ $count++;
+ return $ok;
}
######################### End of black magic.
sub test_eq($$)
{
- PL_eq($_[0],$_[1]) ||
- PL_N_eq($_[0],$_[1]) ||
- PL_V_eq($_[0],$_[1]) ||
- PL_ADJ_eq($_[0],$_[1]);
+ PL_eq($_[0],$_[1]) ||
+ PL_N_eq($_[0],$_[1]) ||
+ PL_V_eq($_[0],$_[1]) ||
+ PL_ADJ_eq($_[0],$_[1]);
}
foreach (<DATA>)
{
# 1 2 3 4 5
- if (/^\s*(.*?)\s*->\s*(.*?)\s*(?:\|\s*(.*?)\s*)?(#\s*(.*))?$/)
- {
- $singular = $1;
- $mod_plural = $2;
- $class_plural = $3 || $2;
- $comment = $5 || '';
- $is_nv = ($comment =~ /verb/i) ? '_V'
- : ($comment =~ /noun/i) ? '_N'
- : '';
+ if (/^\s*(.*?)\s*->\s*(.*?)\s*(?:\|\s*(.*?)\s*)?(#\s*(.*))?$/)
+ {
+ $singular = $1;
+ $mod_plural = $2;
+ $class_plural = $3 || $2;
+ $comment = $5 || '';
+ $is_nv = ($comment =~ /verb/i) ? '_V'
+ : ($comment =~ /noun/i) ? '_N'
+ : '';
classical all=>0, names=>0;
- $mod_PL_V = PL_V($singular);
- $mod_PL_N = PL_N($singular);
- $mod_PL = PL($singular);
- $mod_PL_val = ($is_nv eq '_V') ? $mod_PL_V
- : ($is_nv eq '_N') ? $mod_PL_N
- : $mod_PL;
+ $mod_PL_V = PL_V($singular);
+ $mod_PL_N = PL_N($singular);
+ $mod_PL = PL($singular);
+ $mod_PL_val = ($is_nv eq '_V') ? $mod_PL_V
+ : ($is_nv eq '_N') ? $mod_PL_N
+ : $mod_PL;
classical all=>1;
- $class_PL_V = PL_V($singular);
- $class_PL_N = PL_N($singular);
- $class_PL = PL($singular);
- $class_PL_val = ($is_nv eq '_V') ? $class_PL_V
- : ($is_nv eq '_N') ? $class_PL_N
- : $class_PL;
-
- ok (
- ($mod_plural eq $mod_PL_val)
- &&
- ($class_plural eq $class_PL_val)
- &&
- ( test_eq($singular,$mod_plural) && test_eq($mod_plural,$singular) )
- &&
- ( test_eq($singular,$class_plural) && test_eq($class_plural,$singular) )
- , $singular
+ $class_PL_V = PL_V($singular);
+ $class_PL_N = PL_N($singular);
+ $class_PL = PL($singular);
+ $class_PL_val = ($is_nv eq '_V') ? $class_PL_V
+ : ($is_nv eq '_N') ? $class_PL_N
+ : $class_PL;
+
+ ok (
+ ($mod_plural eq $mod_PL_val)
+ &&
+ ($class_plural eq $class_PL_val)
+ &&
+ ( test_eq($singular,$mod_plural) && test_eq($mod_plural,$singular) )
+ &&
+ ( test_eq($singular,$class_plural) && test_eq($class_plural,$singular) )
+ , $singular
, $mod_PL_val eq $class_PL_val ? $mod_PL_val : "$mod_PL_val|$class_PL_val"
- )
- }
-
-
- elsif (/^\s+(an?)\s+(.*?)\s*$/)
- {
- $article = $1;
- $word = $2;
- $Aword = A($word);
-
- ok ("$article $word" eq $Aword, "$article $word");
- }
+ )
+ }
+
+
+ elsif (/^\s+(an?)\s+(.*?)\s*$/)
+ {
+ $article = $1;
+ $word = $2;
+ $Aword = A($word);
+
+ ok ("$article $word" eq $Aword, "$article $word");
+ }
}
classical 0;
Modified: trunk/liblingua-en-inflect-perl/t/wordlist.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/liblingua-en-inflect-perl/t/wordlist.t?rev=66636&op=diff
==============================================================================
--- trunk/liblingua-en-inflect-perl/t/wordlist.t (original)
+++ trunk/liblingua-en-inflect-perl/t/wordlist.t Thu Dec 30 01:13:01 2010
@@ -3,6 +3,28 @@
my @words;
+# Four words...
+ at words = qw(apple banana carrot tomato);
+
+is WORDLIST(@words),
+ "apple, banana, carrot, and tomato"
+ => 'plain 4 words';
+
+is WORDLIST(@words, {final_sep=>''}),
+ "apple, banana, carrot and tomato"
+ => '4 words, no final sep';
+
+is WORDLIST(@words, {final_sep=>'...'}),
+ "apple, banana, carrot... and tomato"
+ => '4 words, different final sep';
+
+is WORDLIST(@words, {final_sep=>'...', conj=>''}),
+ "apple, banana, carrot... tomato"
+ => '4 words, different final sep, no conjunction';
+
+is WORDLIST(@words, {conj=>'or'}),
+ "apple, banana, carrot, or tomato"
+ => '4 words, different conjunction';
# Three words...
@words = qw(apple banana carrot);
More information about the Pkg-perl-cvs-commits
mailing list