This is an automated email from the git hooks/post-receive script. olly pushed a commit to branch master in repository libsearch-xapian-perl.
commit f26e39ac7d1c6ce5c66f9e60f086439174bf6fe3 Author: Olly Betts <[email protected]> Date: Mon Nov 6 10:03:19 2017 +1300 New upstream release * New upstream release + Includes patch fix-long-see-also-lines.patch so drop. --- Changes | 14 +++ META.json | 4 +- META.yml | 4 +- Makefile.PL | 2 +- README | 2 +- XS/WritableDatabase.xs | 10 +- Xapian.pm | 2 +- Xapian/BM25Weight.pm | 3 +- Xapian/BoolWeight.pm | 3 +- Xapian/Database.pm | 4 +- Xapian/Document.pm | 16 +-- Xapian/Enquire.pm | 4 +- Xapian/MatchSpy.pm | 4 +- Xapian/PositionIterator.pm | 3 +- Xapian/PostingIterator.pm | 3 +- Xapian/Stem.pm | 4 +- Xapian/TermGenerator.pm | 6 +- Xapian/TermIterator.pm | 3 +- Xapian/TradWeight.pm | 3 +- Xapian/ValueCountMatchSpy.pm | 19 ++-- Xapian/ValueIterator.pm | 3 +- Xapian/Weight.pm | 4 +- Xapian/WritableDatabase.pm | 4 +- debian/changelog | 9 +- debian/patches/fix-long-see-also-lines.patch | 147 --------------------------- debian/patches/series | 1 - t/thread.t | 3 +- t/writabledatabase.t | 3 +- 28 files changed, 94 insertions(+), 193 deletions(-) diff --git a/Changes b/Changes index 860b6e3..b0d89d6 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,19 @@ Revision history for Perl extension Search::Xapian. +1.2.25.0 Tue Sep 26 02:06:18 UTC 2017 + [Changes contributed by Olly Betts] + - Wrap WritableDatabase::commit(), which is the preferred name for + WritableDatabase::flush(). + - Fix long SEE ALSO lines by putting a newline after each comma in the + SEE ALSO lists, fixing warnings from man such as: + <standard input>:109: warning [p 1, 8.0i]: can't break line + - Backport some improvements to the POD documentation from the + SWIG-based bindings in xapian-bindings 1.4.x. + - Avoid perl -W in tests as that seems to break recent versions of + Test::More. + - Suppress dummy warning using undef value when building against + xapian-core 1.4.x. + 1.2.24.0 Fri Sep 16 01:46:36 UTC 2016 [Changes contributed by Nick Morrott] - Fix typo in POD documentation (fixes #730). diff --git a/META.json b/META.json index c4e2f9b..05fe9ab 100644 --- a/META.json +++ b/META.json @@ -37,6 +37,6 @@ } }, "release_status" : "stable", - "version" : "v1.2.24.0", - "x_serialization_backend" : "JSON::PP version 2.27300" + "version" : "v1.2.25.0", + "x_serialization_backend" : "JSON::PP version 2.27400_02" } diff --git a/META.yml b/META.yml index f381bd6..36af745 100644 --- a/META.yml +++ b/META.yml @@ -19,5 +19,5 @@ no_index: - inc requires: perl: '5.006000' -version: v1.2.24.0 -x_serialization_backend: 'CPAN::Meta::YAML version 0.012' +version: v1.2.25.0 +x_serialization_backend: 'CPAN::Meta::YAML version 0.018' diff --git a/Makefile.PL b/Makefile.PL index b5f429f..dfda3b4 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -226,7 +226,7 @@ if ($xver !~ /^\Q$BASEVERSION\E(?:_(?:svn|git)[0-9]+)?$/) { unlink "Makefile"; die $msg; } - warn "Warning: $msg"; + warn "Warning: $msg" if defined $msg; } my @bad; diff --git a/README b/README index 79cb18f..b648152 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ -Search::Xapian version 1.2.24.0 +Search::Xapian version 1.2.25.0 =============================== This is Search::Xapian, a Perl XS interface to the Xapian C++ search library. diff --git a/XS/WritableDatabase.xs b/XS/WritableDatabase.xs index c424c0b..f0cf6ef 100644 --- a/XS/WritableDatabase.xs +++ b/XS/WritableDatabase.xs @@ -38,11 +38,19 @@ void WritableDatabase::flush() CODE: try { - THIS->flush(); + THIS->commit(); } catch (...) { handle_exception(); } +void +WritableDatabase::commit() + CODE: + try { + THIS->commit(); + } catch (...) { + handle_exception(); + } void WritableDatabase::begin_transaction(flushed = NO_INIT) diff --git a/Xapian.pm b/Xapian.pm index aa8dc40..d790b0e 100644 --- a/Xapian.pm +++ b/Xapian.pm @@ -4,7 +4,7 @@ use 5.006; use strict; use warnings; -our $VERSION = '1.2.24.0'; +our $VERSION = '1.2.25.0'; use Exporter 'import'; diff --git a/Xapian/BM25Weight.pm b/Xapian/BM25Weight.pm index f7eb202..0fe8ff7 100644 --- a/Xapian/BM25Weight.pm +++ b/Xapian/BM25Weight.pm @@ -55,6 +55,7 @@ Constructor. Either takes no parameters, or the 4 BM25 parameters =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Enquire> +L<Search::Xapian>, +L<Search::Xapian::Enquire> =cut diff --git a/Xapian/BoolWeight.pm b/Xapian/BoolWeight.pm index 08f3228..121ada7 100644 --- a/Xapian/BoolWeight.pm +++ b/Xapian/BoolWeight.pm @@ -52,6 +52,7 @@ Constructor. Takes no arguments. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Enquire> +L<Search::Xapian>, +L<Search::Xapian::Enquire> =cut diff --git a/Xapian/Database.pm b/Xapian/Database.pm index eca20b1..51bc79f 100644 --- a/Xapian/Database.pm +++ b/Xapian/Database.pm @@ -200,6 +200,8 @@ Get the number of elements indexed by a certain term. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Enquire>,L<Search::Xapian::WritableDatabase> +L<Search::Xapian>, +L<Search::Xapian::Enquire>, +L<Search::Xapian::WritableDatabase> =cut diff --git a/Xapian/Document.pm b/Xapian/Document.pm index dcd65a9..62b6abc 100644 --- a/Xapian/Document.pm +++ b/Xapian/Document.pm @@ -91,17 +91,17 @@ Return all document data. Set all document data. This can be anything you like. -=item add_posting <term> <position> [<weight>] +=item add_posting <term> <position> [<wdfinc>] -Adds a term at the given position. weight defaults to 1. +Adds a term at the given position. wdfinc defaults to 1. -=item remove_posting <term> <position> [<weight] +=item remove_posting <term> <position> [<wdfdec>] -Removes a term from the given position. weight defaults to 1. +Removes a term from the given position. wdfdec defaults to 1. -=item add_term <term> [<weight>] +=item add_term <term> [<wdfinc>] -Adds a term without positional information. weight defaults to 1. +Adds a term without positional information. wdfinc defaults to 1. =item add_boolean_term <term> @@ -109,7 +109,7 @@ Adds a term intended for boolean filtering (its wdf contribution will be 0). =item remove_term <term> -Removes a term without positional information. +Removes a term and all postings associated with it. =item clear_terms @@ -117,7 +117,7 @@ Remove all terms from the document. =item termlist_count -Returns number of terms in the document. +Returns number of different terms in the document. =item termlist_begin diff --git a/Xapian/Enquire.pm b/Xapian/Enquire.pm index 3f052d6..b19f756 100644 --- a/Xapian/Enquire.pm +++ b/Xapian/Enquire.pm @@ -264,6 +264,8 @@ Remove all the matchspies. =head1 SEE ALSO -L<Search::Xapian::Query>, L<Search::Xapian::Database>, L<Search::Xapian::MatchSpy> +L<Search::Xapian::Query>, +L<Search::Xapian::Database>, +L<Search::Xapian::MatchSpy> =cut diff --git a/Xapian/MatchSpy.pm b/Xapian/MatchSpy.pm index 2e787f5..2adba75 100644 --- a/Xapian/MatchSpy.pm +++ b/Xapian/MatchSpy.pm @@ -52,6 +52,8 @@ Reimplemented in Xapian::ValueCountMatchSpy. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::ValueCountMatchSpy>,L<Search::Xapian::PerlMatchSpy> +L<Search::Xapian>, +L<Search::Xapian::ValueCountMatchSpy>, +L<Search::Xapian::PerlMatchSpy> =cut diff --git a/Xapian/PositionIterator.pm b/Xapian/PositionIterator.pm index 096bba4..1250f74 100644 --- a/Xapian/PositionIterator.pm +++ b/Xapian/PositionIterator.pm @@ -128,6 +128,7 @@ Return a description of this object. Also implemented as stringification. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Document> +L<Search::Xapian>, +L<Search::Xapian::Document> =cut diff --git a/Xapian/PostingIterator.pm b/Xapian/PostingIterator.pm index e28ebb3..6a0b3e9 100644 --- a/Xapian/PostingIterator.pm +++ b/Xapian/PostingIterator.pm @@ -149,6 +149,7 @@ Return a description of this object. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Database> +L<Search::Xapian>, +L<Search::Xapian::Database> =cut diff --git a/Xapian/Stem.pm b/Xapian/Stem.pm index 4ae6c5a..87e1bb6 100644 --- a/Xapian/Stem.pm +++ b/Xapian/Stem.pm @@ -38,6 +38,8 @@ Returns the stemmed form of the given word. =head1 SEE ALSO -L<Search::Xapian>, L<Search::Xapian::QueryParser>, L<Search::Xapian::TermGenerator> +L<Search::Xapian>, +L<Search::Xapian::QueryParser>, +L<Search::Xapian::TermGenerator> =cut diff --git a/Xapian/TermGenerator.pm b/Xapian/TermGenerator.pm index ebbf143..515de84 100644 --- a/Xapian/TermGenerator.pm +++ b/Xapian/TermGenerator.pm @@ -82,13 +82,13 @@ Set the L<Search::Xapian::Document> object to index terms into. Get the currently set L<Search::Xapian::Document> object. -=item index_text <text> [<weight> [<prefix>]] +=item index_text <text> [<wdf_inc> [<prefix>]] -Indexes the text in string <text>. The optional parameter <weight> sets the +Indexes the text in string <text>. The optional parameter <wdf_inc> sets the wdf increment (default 1). The optional parameter <prefix> sets the term prefix to use (default is no prefix). -=item index_text_without_positions <text> [<weight> [<prefix>]] +=item index_text_without_positions <text> [<wdf_inc> [<prefix>]] Just like index_text, but no positional information is generated. This means that the database will be significantly smaller, but that phrase searching diff --git a/Xapian/TermIterator.pm b/Xapian/TermIterator.pm index 49de4b7..4c95385 100644 --- a/Xapian/TermIterator.pm +++ b/Xapian/TermIterator.pm @@ -122,7 +122,8 @@ as the C<ne> and C<!=> operators. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Document> +L<Search::Xapian>, +L<Search::Xapian::Document> =cut diff --git a/Xapian/TradWeight.pm b/Xapian/TradWeight.pm index 626041a..cd8acc8 100644 --- a/Xapian/TradWeight.pm +++ b/Xapian/TradWeight.pm @@ -56,6 +56,7 @@ If k isn't specified, the default value used is 1. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Enquire> +L<Search::Xapian>, +L<Search::Xapian::Enquire> =cut diff --git a/Xapian/ValueCountMatchSpy.pm b/Xapian/ValueCountMatchSpy.pm index c3b1147..e93719e 100644 --- a/Xapian/ValueCountMatchSpy.pm +++ b/Xapian/ValueCountMatchSpy.pm @@ -46,10 +46,10 @@ Search::Xapian::ValueCountMatchSpy - Class for counting the frequencies of value my $enq = $db->enquire( '[QUERY TERM]' ); my $spy = Search::Xapian::ValueCountMatchSpy->new(0); $enq->add_matchspy($spy); - my $mset = $enq->get_mset(0, 10, 10000); + my $mset = $enq->get_mset(0, 10, 10000); print "Match spy registered " . $spy->get_total() . " documents\n"; - + my $end = $spy->values_end(); for (my $it = $spy->values_begin(); $it != $end; $it++) { print $it->get_termname() . " - " . $it->get_termfreq(); @@ -57,12 +57,12 @@ Search::Xapian::ValueCountMatchSpy - Class for counting the frequencies of value =head1 DESCRIPTION -Class for counting the frequencies of values in the matching documents. +Class for counting the frequencies of values in the matching documents. Wraps Xapian::ValueCountMatchSpy =head1 METHODS -=over 4 +=over 4 =item new @@ -74,24 +74,25 @@ Return the total number of documents tallied. =item values_begin -Get an iterator over the values seen in the slot. +Get an iterator over the values seen in the slot. =item values_end -End iterator corresponding to values_begin(). +End iterator corresponding to values_begin(). =item top_values_begin <maxvalues> -Get an iterator over the most frequent values seen in the slot. +Get an iterator over the most frequent values seen in the slot. =item top_values_end <maxvalues> -End iterator corresponding to top_values_begin(). +End iterator corresponding to top_values_begin(). =back =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::MatchSpy> +L<Search::Xapian>, +L<Search::Xapian::MatchSpy> =cut diff --git a/Xapian/ValueIterator.pm b/Xapian/ValueIterator.pm index 7c8443d..442ddc9 100644 --- a/Xapian/ValueIterator.pm +++ b/Xapian/ValueIterator.pm @@ -106,6 +106,7 @@ as the C<ne> and C<!=> operators. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Document> +L<Search::Xapian>, +L<Search::Xapian::Document> =cut diff --git a/Xapian/Weight.pm b/Xapian/Weight.pm index 91e5e41..8efd5a3 100644 --- a/Xapian/Weight.pm +++ b/Xapian/Weight.pm @@ -21,6 +21,8 @@ This is an abstract base class for weighting schemes in Xapian. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::BoolWeight>,L<Search::Xapian::BM25Weight> +L<Search::Xapian>, +L<Search::Xapian::BoolWeight>, +L<Search::Xapian::BM25Weight> =cut diff --git a/Xapian/WritableDatabase.pm b/Xapian/WritableDatabase.pm index 7bf1cd3..120d8a1 100644 --- a/Xapian/WritableDatabase.pm +++ b/Xapian/WritableDatabase.pm @@ -208,6 +208,8 @@ progress. =head1 SEE ALSO -L<Search::Xapian>,L<Search::Xapian::Enquire>,L<Search::Xapian::Database> +L<Search::Xapian>, +L<Search::Xapian::Enquire>, +L<Search::Xapian::Database> =cut diff --git a/debian/changelog b/debian/changelog index 9c0a5e6..f031432 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,13 @@ -libsearch-xapian-perl (1.2.24.0-2) UNRELEASED; urgency=medium +libsearch-xapian-perl (1.2.25.0-1) UNRELEASED; urgency=medium + [ Alex Muntada ] * Remove inactive pkg-perl members from Uploaders. - -- Alex Muntada <[email protected]> Sun, 08 Oct 2017 17:33:05 +0200 + [ Olly Betts ] + * New upstream release + + Includes patch fix-long-see-also-lines.patch so drop. + + -- Olly Betts <[email protected]> Mon, 06 Nov 2017 10:00:22 +1300 libsearch-xapian-perl (1.2.24.0-1) unstable; urgency=medium diff --git a/debian/patches/fix-long-see-also-lines.patch b/debian/patches/fix-long-see-also-lines.patch deleted file mode 100644 index a54964a..0000000 --- a/debian/patches/fix-long-see-also-lines.patch +++ /dev/null @@ -1,147 +0,0 @@ -Description: Fix long SEE ALSO lines - Put a newline after each comma in the SEE ALSO lists, fixing warnings from - man such as: - - <standard input>:109: warning [p 1, 8.0i]: can't break line -Author: Olly Betts <[email protected]> -Origin: upstream -Forwarded: https://git.xapian.org/?p=xapian;a=commit;h=f12a81e444124e4365720369414d4851da20c32c -Last-Update: 2016-09-30 - ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/BM25Weight.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/BM25Weight.pm -@@ -55,6 +55,7 @@ Constructor. Either takes no parameters, - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Enquire> -+L<Search::Xapian>, -+L<Search::Xapian::Enquire> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/BoolWeight.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/BoolWeight.pm -@@ -52,6 +52,7 @@ Constructor. Takes no arguments. - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Enquire> -+L<Search::Xapian>, -+L<Search::Xapian::Enquire> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/Database.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/Database.pm -@@ -200,6 +200,8 @@ Get the number of elements indexed by a - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Enquire>,L<Search::Xapian::WritableDatabase> -+L<Search::Xapian>, -+L<Search::Xapian::Enquire>, -+L<Search::Xapian::WritableDatabase> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/MatchSpy.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/MatchSpy.pm -@@ -52,6 +52,8 @@ Reimplemented in Xapian::ValueCountMatch - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::ValueCountMatchSpy>,L<Search::Xapian::PerlMatchSpy> -+L<Search::Xapian>, -+L<Search::Xapian::ValueCountMatchSpy>, -+L<Search::Xapian::PerlMatchSpy> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/PositionIterator.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/PositionIterator.pm -@@ -128,6 +128,7 @@ Return a description of this object. Al - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Document> -+L<Search::Xapian>, -+L<Search::Xapian::Document> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/PostingIterator.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/PostingIterator.pm -@@ -149,6 +149,7 @@ Return a description of this object. - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Database> -+L<Search::Xapian>, -+L<Search::Xapian::Database> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/TermIterator.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/TermIterator.pm -@@ -122,7 +122,8 @@ as the C<ne> and C<!=> operators. - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Document> -+L<Search::Xapian>, -+L<Search::Xapian::Document> - - =cut - ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/TradWeight.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/TradWeight.pm -@@ -56,6 +56,7 @@ If k isn't specified, the default value - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Enquire> -+L<Search::Xapian>, -+L<Search::Xapian::Enquire> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/ValueCountMatchSpy.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/ValueCountMatchSpy.pm -@@ -92,6 +92,7 @@ End iterator corresponding to top_values - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::MatchSpy> -+L<Search::Xapian>, -+L<Search::Xapian::MatchSpy> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/ValueIterator.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/ValueIterator.pm -@@ -106,6 +106,7 @@ as the C<ne> and C<!=> operators. - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Document> -+L<Search::Xapian>, -+L<Search::Xapian::Document> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/Weight.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/Weight.pm -@@ -21,6 +21,8 @@ This is an abstract base class for weigh - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::BoolWeight>,L<Search::Xapian::BM25Weight> -+L<Search::Xapian>, -+L<Search::Xapian::BoolWeight>, -+L<Search::Xapian::BM25Weight> - - =cut ---- libsearch-xapian-perl-1.2.24.0.orig/Xapian/WritableDatabase.pm -+++ libsearch-xapian-perl-1.2.24.0/Xapian/WritableDatabase.pm -@@ -208,6 +208,8 @@ progress. - - =head1 SEE ALSO - --L<Search::Xapian>,L<Search::Xapian::Enquire>,L<Search::Xapian::Database> -+L<Search::Xapian>, -+L<Search::Xapian::Enquire>, -+L<Search::Xapian::Database> - - =cut diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ecca6ef..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-long-see-also-lines.patch diff --git a/t/thread.t b/t/thread.t index 69c0513..fae7026 100644 --- a/t/thread.t +++ b/t/thread.t @@ -1,5 +1,6 @@ -#!/usr/bin/perl -W +#!/usr/bin/perl use strict; +use warnings qw(all); # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl test.pl' diff --git a/t/writabledatabase.t b/t/writabledatabase.t index ef606ef..5db6e7f 100644 --- a/t/writabledatabase.t +++ b/t/writabledatabase.t @@ -1,5 +1,6 @@ -#!/usr/bin/perl -W +#!/usr/bin/perl use strict; +use warnings qw(all); # Before `make install' is performed this script should be runnable with # `make test'. After `make install' it should work as `perl test.pl' -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libsearch-xapian-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
