r29095 - in /trunk/libsearch-xapian-perl: Changes META.yml Makefile.PL README Xapian.pm debian/changelog
gregoa at users.alioth.debian.org
gregoa at users.alioth.debian.org
Thu Jan 1 20:41:20 UTC 2009
Author: gregoa
Date: Thu Jan 1 20:41:16 2009
New Revision: 29095
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=29095
Log:
New upstream release.
Modified:
trunk/libsearch-xapian-perl/Changes
trunk/libsearch-xapian-perl/META.yml
trunk/libsearch-xapian-perl/Makefile.PL
trunk/libsearch-xapian-perl/README
trunk/libsearch-xapian-perl/Xapian.pm
trunk/libsearch-xapian-perl/debian/changelog
Modified: trunk/libsearch-xapian-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/Changes?rev=29095&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/Changes (original)
+++ trunk/libsearch-xapian-perl/Changes Thu Jan 1 20:41:16 2009
@@ -1,4 +1,12 @@
Revision history for Perl extension Search::Xapian.
+
+1.0.10.0 Tue Dec 23 09:18:21 GMT 2008
+ [Changes contributed by Olly Betts]
+ - Makefile.PL now supports a "fake VPATH" mode, to better support for
+ building from SVN. If you run "perl /path/to/Makefile.PL" then
+ Makefile.PL will run Makefile.PL as nomal in /path/to, and then
+ create a stub Makefile in the current directory which forwards any
+ make invocations.
1.0.9.0 Fri Oct 31 23:27:06 GMT 2008
[Changes contributed by Olly Betts]
Modified: trunk/libsearch-xapian-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/META.yml?rev=29095&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/META.yml (original)
+++ trunk/libsearch-xapian-perl/META.yml Thu Jan 1 20:41:16 2009
@@ -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: Search-Xapian
-version: 1.0.9.0
+version: 1.0.10.0
version_from: Xapian.pm
installdirs: site
requires:
Modified: trunk/libsearch-xapian-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/Makefile.PL?rev=29095&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/Makefile.PL (original)
+++ trunk/libsearch-xapian-perl/Makefile.PL Thu Jan 1 20:41:16 2009
@@ -5,6 +5,14 @@
# Suppress warnings about parameters we allow the user to specify.
$ExtUtils::MakeMaker::Recognized_Att_Keys{CXX} = 1;
$ExtUtils::MakeMaker::Recognized_Att_Keys{XAPIAN_CONFIG} = 1;
+
+my $builddir;
+
+my $srcdir = $0;
+if ($srcdir =~ s!/.*!!) {
+ chomp($builddir = `pwd`);
+ chdir $srcdir;
+}
my $xapian_config;
my $CC;
@@ -110,7 +118,8 @@
'LD' => $LD,
'INC' => $inc, # e.g., '-I/usr/include/other'
'XSOPT' => '-C++',
- 'TYPEMAPS' => ['perlobject.map','typemap'],
+ # 'typemap' is implicitly added to this list.
+ 'TYPEMAPS' => ['perlobject.map'],
# Add "make check" as alias for "make test".
'depend' => { 'check' => 'test' },
);
@@ -127,7 +136,7 @@
my ($BASEVERSION) = $VERSION =~ /^([0-9]+\.[0-9]+\.[0-9]+)/;
if ($xver !~ /^\Q$BASEVERSION\E(?:_svn[0-9]+)?$/) {
- # There's no chance that we'll with xapian-core 0.x.y.
+ # There's no chance that we'll work with xapian-core 0.x.y.
my $no_chance = ($xver =~ /^0/);
my $msg;
if ($no_chance) {
@@ -173,6 +182,25 @@
die(join(",", at bad).": No mention of current version: $VERSION\n");
}
+# If we're doing a fake VPATH build, add a stub Makefile which forwards all
+# invocations (.DEFAULT is a GNU-make-ism).
+if (defined $builddir) {
+ open M, '>', "$builddir/Makefile~" or die $!;
+ print M <<"EOF";
+.DEFAULT:
+\t\$(MAKE) -C "$srcdir" \$\@
+
+.PHONY: Search-Xapian-$VERSION.tar.gz
+
+dist tardist Search-Xapian-$VERSION.tar.gz:
+\t\$(MAKE) -C "$srcdir" \$\@
+\trm -f Search-Xapian-$VERSION.tar.gz
+\tcp "$srcdir"/Search-Xapian-$VERSION.tar.gz .
+EOF
+
+ close M or die $!;
+ rename "$builddir/Makefile~", "$builddir/Makefile" or die $!;
+}
sub MY::postamble {
return "\$(XS_FILES): ".join(" ", <XS/*.xs>)."\n\ttouch \$(XS_FILES)";
Modified: trunk/libsearch-xapian-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/README?rev=29095&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/README (original)
+++ trunk/libsearch-xapian-perl/README Thu Jan 1 20:41:16 2009
@@ -1,5 +1,5 @@
-Search::Xapian version 1.0.9.0
-==============================
+Search::Xapian version 1.0.10.0
+===============================
This is Search::Xapian, a Perl XS frontend to the Xapian C++ search library.
Modified: trunk/libsearch-xapian-perl/Xapian.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/Xapian.pm?rev=29095&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/Xapian.pm (original)
+++ trunk/libsearch-xapian-perl/Xapian.pm Thu Jan 1 20:41:16 2009
@@ -4,7 +4,7 @@
use strict;
use warnings;
-our $VERSION = '1.0.9.0';
+our $VERSION = '1.0.10.0';
use Exporter 'import';
Modified: trunk/libsearch-xapian-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libsearch-xapian-perl/debian/changelog?rev=29095&op=diff
==============================================================================
--- trunk/libsearch-xapian-perl/debian/changelog (original)
+++ trunk/libsearch-xapian-perl/debian/changelog Thu Jan 1 20:41:16 2009
@@ -1,4 +1,4 @@
-libsearch-xapian-perl (1.0.9.0-1) UNRELEASED; urgency=low
+libsearch-xapian-perl (1.0.10.0-1) UNRELEASED; urgency=low
QUESTION: should we worry about
"Warning: Xapian version 1.0.7 may be incompatible with Search::Xapian
More information about the Pkg-perl-cvs-commits
mailing list