r47565 - in /branches/upstream/libsearch-xapian-perl/current: Changes META.yml README Xapian.pm Xapian.xs

[olly at users.alioth.debian.org]

Author: olly
Date: Sat Nov 21 13:55:09 2009
New Revision: 47565

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47565
Log:
[svn-upgrade] Integrating new upstream version, libsearch-xapian-perl (1.0.17.0)

Modified:
    branches/upstream/libsearch-xapian-perl/current/Changes
    branches/upstream/libsearch-xapian-perl/current/META.yml
    branches/upstream/libsearch-xapian-perl/current/README
    branches/upstream/libsearch-xapian-perl/current/Xapian.pm
    branches/upstream/libsearch-xapian-perl/current/Xapian.xs

Modified: branches/upstream/libsearch-xapian-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/Changes?rev=47565&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/Changes (original)
+++ branches/upstream/libsearch-xapian-perl/current/Changes Sat Nov 21 13:55:09 2009
@@ -1,4 +1,9 @@
 Revision history for Perl extension Search::Xapian.
+
+1.0.17.0  Wed Nov 18 02:02:41 UTC 2009
+	[Changes contributed by Olly Betts]
+	- Fix to build with compilers other than GCC by disabling Perl's
+	  #define for bool.  (ticket#404)
 
 1.0.16.0  Thu Sep 10 06:26:08 UTC 2009
 	[Changes contributed by Olly Betts]

Modified: branches/upstream/libsearch-xapian-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/META.yml?rev=47565&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/META.yml (original)
+++ branches/upstream/libsearch-xapian-perl/current/META.yml Sat Nov 21 13:55:09 2009
@@ -1,10 +1,13 @@
-# 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.16.0
-version_from: Xapian.pm
-installdirs:  site
-requires:
-
-distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.30_01
+--- #YAML:1.0
+name:                Search-Xapian
+version:             1.0.17.0
+abstract:            Perl XS frontend to the Xapian C++ search library.
+license:             ~
+author:              
+    - Alex Bowley <xapian-discuss at lists.xapian.org>
+generated_by:        ExtUtils::MakeMaker version 6.42
+distribution_type:   module
+requires:     
+meta-spec:
+    url:     http://module-build.sourceforge.net/META-spec-v1.3.html
+    version: 1.3

Modified: branches/upstream/libsearch-xapian-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/README?rev=47565&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/README (original)
+++ branches/upstream/libsearch-xapian-perl/current/README Sat Nov 21 13:55:09 2009
@@ -1,4 +1,4 @@
-Search::Xapian version 1.0.16.0
+Search::Xapian version 1.0.17.0
 ===============================
 
 This is Search::Xapian, a Perl XS frontend to the Xapian C++ search library.

Modified: branches/upstream/libsearch-xapian-perl/current/Xapian.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/Xapian.pm?rev=47565&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/Xapian.pm (original)
+++ branches/upstream/libsearch-xapian-perl/current/Xapian.pm Sat Nov 21 13:55:09 2009
@@ -4,7 +4,7 @@
 use strict;
 use warnings;
 
-our $VERSION = '1.0.16.0';
+our $VERSION = '1.0.17.0';
 
 use Exporter 'import';
 

Modified: branches/upstream/libsearch-xapian-perl/current/Xapian.xs
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libsearch-xapian-perl/current/Xapian.xs?rev=47565&op=diff
==============================================================================
--- branches/upstream/libsearch-xapian-perl/current/Xapian.xs (original)
+++ branches/upstream/libsearch-xapian-perl/current/Xapian.xs Sat Nov 21 13:55:09 2009
@@ -3,6 +3,10 @@
 #include <xapian.h>
 #include <string>
 #include <vector>
+
+// Stop Perl headers from even thinking of doing '#define bool char' or
+// '#define bool int', which they would do with compilers other than GCC.
+#define HAS_BOOL
 
 #ifdef __cplusplus
 extern "C" {