r7197 - in /trunk/libwordnet-querydata-perl: ChangeLog META.yml Makefile.PL QueryData.pm README debian/changelog debian/control debian/copyright debian/rules test.pl

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Mon Aug 27 22:11:44 UTC 2007


Author: gregoa-guest
Date: Mon Aug 27 22:11:44 2007
New Revision: 7197

URL: http://svn.debian.org/wsvn/?sc=1&rev=7197
Log:
* New upstream release.
* Separate Build-Depends and Build-Depends-Indep.
* Add wordnet-base to build dependencies.
* Extend debian/copyright.
* Set WNHOME and WNSEARCHDIR in debian/rules.

Modified:
    trunk/libwordnet-querydata-perl/ChangeLog
    trunk/libwordnet-querydata-perl/META.yml
    trunk/libwordnet-querydata-perl/Makefile.PL
    trunk/libwordnet-querydata-perl/QueryData.pm
    trunk/libwordnet-querydata-perl/README
    trunk/libwordnet-querydata-perl/debian/changelog
    trunk/libwordnet-querydata-perl/debian/control
    trunk/libwordnet-querydata-perl/debian/copyright
    trunk/libwordnet-querydata-perl/debian/rules
    trunk/libwordnet-querydata-perl/test.pl

Modified: trunk/libwordnet-querydata-perl/ChangeLog
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/ChangeLog?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/ChangeLog (original)
+++ trunk/libwordnet-querydata-perl/ChangeLog Mon Aug 27 22:11:44 2007
@@ -1,3 +1,11 @@
+2007-05-06  Jason Rennie
+
+	* release 1.46
+	* QueryData.pm (version): removed (Invalid as of WN 3.0)
+	* test.pm: remove tests for pre-3.0 WN; update tests for WN 3.0
+	* README, QueryData.pm: update documentation of WN version to 3.0
+	* Makefile.PL: update default WN paths
+
 2006-10-16  Jason Rennie
 
 	* release 1.45
@@ -26,7 +34,7 @@
 
 	* release 1.42
 	
-2005-10-05  Hugh S. Myers
+2006-10-05  Hugh S. Myers
 
 	* QueryData.pm (offset): return undef if anything is undefined
 

Modified: trunk/libwordnet-querydata-perl/META.yml
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/META.yml?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/META.yml (original)
+++ trunk/libwordnet-querydata-perl/META.yml Mon Aug 27 22:11:44 2007
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         WordNet-QueryData
-version:      1.45
+version:      1.46
 version_from: QueryData.pm
 installdirs:  site
 requires:

Modified: trunk/libwordnet-querydata-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/Makefile.PL?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/Makefile.PL (original)
+++ trunk/libwordnet-querydata-perl/Makefile.PL Mon Aug 27 22:11:44 2007
@@ -5,6 +5,8 @@
 # $wnHomePC).  These need to be synchronized.  I need to import those
 # variables from QueryData.pm.
 
+die "*** Please set the WNHOME environment variable to the location of your\n***   WordNet installation.  QueryData.pm will not work otherwise.\n*** Alternatively, you can make the installation in the default\n***   location, C:\\Program Files\\WordNet\\3.0 on Windows, or /usr/local/WordNet-3.0 on unix.\n" unless exists $ENV{WNHOME} or -d "C:\\Program Files\\WordNet\\3.0" or -d "/usr/local/WordNet-3.0";
+
 WriteMakefile(
     'dist'      => { 'COMPRESS'  => 'gzip', 'SUFFIX'    => '.gz', },
     'NAME'	=> 'WordNet::QueryData',

Modified: trunk/libwordnet-querydata-perl/QueryData.pm
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/QueryData.pm?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/QueryData.pm (original)
+++ trunk/libwordnet-querydata-perl/QueryData.pm Mon Aug 27 22:11:44 2007
@@ -9,7 +9,7 @@
 # This module is free software; you can redistribute it and/or modify
 # it under the same terms as Perl itself.
 
-# $Id: QueryData.pm,v 1.45 2006/10/17 02:34:08 jrennie Exp $
+# $Id: QueryData.pm,v 1.46 2007/05/07 01:08:31 jrennie Exp $
 
 ####### manual page & loadIndex ##########
 
@@ -42,7 +42,7 @@
     @EXPORT = qw();
     # Allows these functions to be used without qualification
     @EXPORT_OK = qw();
-    $VERSION = do { my @r=(q$Revision: 1.45 $=~/\d+/g); sprintf "%d."."%02d"x$#r, at r };
+    $VERSION = do { my @r=(q$Revision: 1.46 $=~/\d+/g); sprintf "%d."."%02d"x$#r, at r };
 }
 
 #############################
@@ -203,9 +203,9 @@
 my @indexFile = ("", "index.noun", "index.verb", "index.adj", "index.adv");
 my @dataFile = ("", "data.noun", "data.verb", "data.adj", "data.adv");
 
-my $wnHomeUnix = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "/usr/share/wordnet";
-my $wnHomePC = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "C:\\Program Files\\WordNet\\2.1";
-my $wnPrefixUnix = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomeUnix";
+my $wnHomeUnix = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "/usr/local/WordNet-3.0";
+my $wnHomePC = defined($ENV{"WNHOME"}) ? $ENV{"WNHOME"} : "C:\\Program Files\\WordNet\\3.0";
+my $wnPrefixUnix = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomeUnix/dict";
 my $wnPrefixPC = defined($ENV{"WNSEARCHDIR"}) ? $ENV{"WNSEARCHDIR"} : "$wnHomePC\\dict";
 
 END { } # module clean-up code here (global destructor)
@@ -215,7 +215,8 @@
 ###############
 
 # report WordNet version
-sub version { my $self = shift; return $self->{version}; }
+# Invalid way of identifying version as of WordNet 3.0
+#sub version { my $self = shift; return $self->{version}; }
 
 # report WordNet data dir -- Sid (05/01/2003)
 sub dataPath { my $self = shift; return $self->{wnpath}; }
@@ -974,7 +975,7 @@
 WNSEARCHDIR.  If WNSEARCHDIR is set, QueryData looks for WordNet data
 files there.  Otherwise, QueryData looks for WordNet data files in
 WNHOME/dict (WNHOME\dict on a PC).  If WNHOME is not set, it defaults
-to "/usr/local/WordNet-2.1" on Unix and "C:\Program Files\WordNet\2.1"
+to "/usr/local/WordNet-3.0" on Unix and "C:\Program Files\WordNet\3.0"
 on a PC.  Normally, all you have to do is to set the WNHOME variable
 to the location where you unpacked your WordNet distribution.  The
 database files are normally unpacked to the "dict" subdirectory.

Modified: trunk/libwordnet-querydata-perl/README
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/README?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/README (original)
+++ trunk/libwordnet-querydata-perl/README Mon Aug 27 22:11:44 2007
@@ -14,7 +14,7 @@
 -------------
 
 - Perl5
-- WordNet Database Package version 2.1
+- WordNet Database Package version 3.0
 
 DOCUMENTATION
 -------------
@@ -31,7 +31,7 @@
 
 This assumes that perl was installed to the default location (C:\perl).
 
-  0) Make sure that you have installed WordNet to C:\Program Files\WordNet\2.1
+  0) Make sure that you have installed WordNet to C:\Program Files\WordNet\3.0
   1) Unpack the WordNet QueryData distribution
   2) Create the directory C:\perl\site\lib\WordNet
   3) Copy QueryData.pm to C:\perl\site\lib\WordNet

Modified: trunk/libwordnet-querydata-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/debian/changelog?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/debian/changelog (original)
+++ trunk/libwordnet-querydata-perl/debian/changelog Mon Aug 27 22:11:44 2007
@@ -1,3 +1,13 @@
+libwordnet-querydata-perl (1.46-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+  * Separate Build-Depends and Build-Depends-Indep.
+  * Add wordnet-base to build dependencies.
+  * Extend debian/copyright.
+  * Set WNHOME and WNSEARCHDIR in debian/rules.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Tue, 28 Aug 2007 00:10:49 +0200
+
 libwordnet-querydata-perl (1.45-1) unstable; urgency=low
 
   * Initial Release.

Modified: trunk/libwordnet-querydata-perl/debian/control
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/debian/control?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/debian/control (original)
+++ trunk/libwordnet-querydata-perl/debian/control Mon Aug 27 22:11:44 2007
@@ -1,8 +1,10 @@
 Source: libwordnet-querydata-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 5.0.0), perl (>= 5.6.0), wordnet-sense-index
-Maintainer: Kjetil Kjernsmo (Work key) <kjetilk at opera.com>
+Build-Depends: debhelper (>= 5.0.0)
+Build-Depends-Indep: perl (>= 5.6.0), wordnet-sense-index, wordnet-base
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Kjetil Kjernsmo (Work key) <kjetilk at opera.com>, gregor herrmann <gregor+debian at comodo.priv.at>
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libwordnet-querydata-perl/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-perl/trunk/libwordnet-querydata-perl/

Modified: trunk/libwordnet-querydata-perl/debian/copyright
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/debian/copyright?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/debian/copyright (original)
+++ trunk/libwordnet-querydata-perl/debian/copyright Mon Aug 27 22:11:44 2007
@@ -1,5 +1,6 @@
-This is the debian package for the WordNet-QueryData module.
-It was created by Kjetil Kjernsmo <kjetilk at opera.com> using dh-make-perl.
+This is the debian package for the WordNet-QueryData module. It was created
+by Kjetil Kjernsmo <kjetilk at opera.com> using dh-make-perl and is maintained
+by the Debian Perl Group.
 
 Copyright 2000-2005 Jason Rennie.  All rights reserved.
 
@@ -10,3 +11,7 @@
 the Artistic License.  On Debian GNU/Linux systems, the complete text of the
 GNU General Public License can be found in `/usr/share/common-licenses/GPL'
 and the Artistic Licence in `/usr/share/common-licenses/Artistic'.
+
+The Debian Packaging is (c) 2007, Kjetil Kjernsmo <kjetilk at opera.com> and
+gregor herrmann <gregor+debian at comodo.priv.at> and is licensed under the
+same terms as the software itself (see above).

Modified: trunk/libwordnet-querydata-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/debian/rules?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/debian/rules (original)
+++ trunk/libwordnet-querydata-perl/debian/rules Mon Aug 27 22:11:44 2007
@@ -10,6 +10,9 @@
 # If set to a true value then MakeMaker's prompt function will
 # always return the default without waiting for user input.
 export PERL_MM_USE_DEFAULT=1
+
+export WNHOME=/usr/share/wordnet
+export WNSEARCHDIR=/usr/share/wordnet
 
 PACKAGE=$(shell dh_listpackages)
 

Modified: trunk/libwordnet-querydata-perl/test.pl
URL: http://svn.debian.org/wsvn/trunk/libwordnet-querydata-perl/test.pl?rev=7197&op=diff
==============================================================================
--- trunk/libwordnet-querydata-perl/test.pl (original)
+++ trunk/libwordnet-querydata-perl/test.pl Mon Aug 27 22:11:44 2007
@@ -2,12 +2,11 @@
 # Before `make install' is performed this script should be runnable with
 # `make test'. After `make install' it should work as `perl test.pl'
 
-# $Id: test.pl,v 1.39 2006/10/17 02:37:42 jrennie Exp $
+# $Id: test.pl,v 1.40 2007/05/07 01:08:31 jrennie Exp $
 
 my $i = 1;
 BEGIN { 
     $| = 1;
-    print "v2.0: 1..54\nv2.1: 1..54\n";
 }
 END { print "not ok 1\n" unless $loaded; }
 use WordNet::QueryData;
@@ -23,8 +22,8 @@
 my $wn = WordNet::QueryData->new;
 #my $wn = WordNet::QueryData->new("/scratch/jrennie/WordNet-2.1/dict");
 
-my $ver = $wn->version();
-print "Found WordNet database version $ver\n";
+#my $ver = $wn->version();
+#print "Found WordNet database version $ver\n";
 
 #print join("\n",$wn->listAllWords('n'));
 
@@ -42,7 +41,7 @@
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
 scalar $wn->querySense ("rabbit#n") == 3
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-scalar $wn->querySense ("rabbit#n#1", "hypo") == 6
+scalar $wn->querySense ("rabbit#n#1", "hypo") == 7
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
 
 # check that underscore is added, syntactic marker is removed
@@ -137,7 +136,7 @@
 # frequency() tests
 $wn->frequency('thirteenth#a#1') == 1
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-$wn->frequency('night#n#2') == 217
+$wn->frequency('night#n#1') == 163
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
 $wn->frequency('cnn#n#1') == 0
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
@@ -147,34 +146,15 @@
 $foo[1] == 2
     ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
 
-if ($ver eq "2.0")
-{
-    ($wn->queryWord('person#n#1', 'deri'))[0] eq 'personify#v#3'
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    ($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#1'
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    #print scalar $wn->offset("0#n#1"), "\n";
-    scalar $wn->offset("0#n#1") == 12967124
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    scalar $wn->listAllWords("noun") == 114648
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    #print $wn->offset("child#n#1"), "\n";
-    $wn->offset("child#n#1") == 9284669
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    my ($foo) = $wn->querySense ("cat#n#1", "glos");
-    ($foo eq "feline mammal usually having thick soft fur and being unable to roar; domestic cats; wildcats  ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-} elsif ($ver eq "2.1")
-{
-    ($wn->queryWord('person#n#1', 'deri'))[0] eq 'personhood#n#1'
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    ($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#2'
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    scalar $wn->offset("0#n#1") == 13561555
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    scalar $wn->listAllWords("noun") == 117097
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    $wn->offset("child#n#1") == 9771320
-	? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-    my ($foo) = $wn->querySense ("cat#n#1", "glos");
-   ($foo eq "feline mammal usually having thick soft fur and no ability to roar: domestic cats; wildcats  ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
-}
+($wn->queryWord('person#n#1', 'deri'))[0] eq 'personhood#n#1'
+    ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+($wn->querySense('acropetal#a#1', 'dmnc'))[0] eq 'botany#n#2'
+    ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+scalar $wn->offset("0#n#1") == 13742358
+    ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+scalar $wn->listAllWords("noun") == 117798
+    ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+$wn->offset("child#n#1") == 9917593
+    ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";
+my ($foo) = $wn->querySense ("cat#n#1", "glos");
+($foo eq "feline mammal usually having thick soft fur and no ability to roar: domestic cats; wildcats  ") ? print "ok ", $i++, "\n" : print "not ok ", $i++, "\n";




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