Tue Jan 28 23:47:21 GMT 2014  Olly Betts <olly@survex.com>

	* NEWS,configure.ac: Update for 1.2.17.

Tue Jan 28 22:48:33 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Sun C++ seems to explicitly need Crun now.

Tue Jan 28 22:23:07 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Fix checks for Sun C++.

Tue Jan 28 22:16:13 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Improve handling of Sun's C++ compiler - trick libtool
	  into not adding -library=Cstd, and prefer -library=stdcxx4 if
	  supported.

Tue Jan 28 22:13:30 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Add XAPIAN_TEST_CXXFLAGS macro, and use it to check
	  the flags to cxx actually work.

Tue Jan 28 22:10:51 GMT 2014  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* configure.ac: Apply missing functional part of previous change.
	* configure.ac: Avoid using grep -e as /usr/bin/grep on Solaris
	  doesn't support it.

Tue Jan 28 08:31:04 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* include/xapian/valueiterator.h: Protect the check() method in
	  our API which takes one argument from OS X SDK's check() macro.

Tue Jan 28 07:15:48 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* net/progclient.cc: Fix xlC warning.

Mon Jan 06 08:09:14 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_table.cc,backends/chert/chert_table.cc,
	  backends/flint/flint_table.cc: Validate dir_end when reading a
	  block.  (fixes #592)

Fri Jan 03 21:56:51 GMT 2014  Olly Betts <olly@survex.com>

	* NEWS: Update.

Wed Jan 01 03:53:47 GMT 2014  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/Makefile.am: Fix handling of MAINTAINER_NO_DOCS.

Mon Dec 30 05:38:00 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/postingsource.rst: Clarify a couple of points (reported by
	  "vHanda" on IRC).

Mon Dec 30 05:36:50 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/api_unicode.cc: Add regression test for incorrect results
	  from Unicode::tolower() for 4 code points (U+01C5, U+01C8, U+01CB,
	  U+01F2) with Xapian 1.2.16 and earlier.

Mon Dec 30 05:08:23 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* HACKING: Note that Tcl is now needed to generate
	  unicode/unicode-data.cc.
	* tests/api_unicode.cc: Add a tests that additions and changes in
	  Unicode > 5.2 aren't active.
	* unicode/Makefile.mk,unicode/uniParse.tcl: Adjust to not need a
	  symlink.  Give the generated file a new name, since the "tcl" prefix
	  doesn't make much sense here, and it avoids issues with
	  transitioning from a file in version control to one which is
	  generated.
	* unicode/: Add the source data file and scripts to generate
	  tclUniData.cc.

Tue Dec 24 22:40:04 GMT 2013  Olly Betts <olly@survex.com>

	* tests/api_backend.cc: Fix apitest to build when brass, chert or
	  flint are disabled.

Tue Dec 24 02:15:16 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* tests/Makefile.am,tests/perftest/Makefile.mk: Actually use
	  @NO_INSTALL@.
	* configure.ac: Use -no-fast-install on platforms where -no-install
	  causes libtool to emit a warning.

Mon Dec 23 02:20:37 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* include/xapian/enquire.h: Note that 1.2.17 is required for the
	  correct sense of the reverse parameter to Enquire methods
	  set_sort_by_relevance_then_value() and
	  set_sort_by_relevance_then_key().

Fri Dec 20 06:48:49 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update.

Thu Dec 19 09:23:01 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/deprecation.rst: Update example version to a more recent one.

Thu Dec 19 09:22:17 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/harness/backendmanager_multi.cc: Fix comment typo.

Thu Dec 19 09:18:50 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_table.cc,backends/chert/chert_table.cc,
	  backends/flint/flint_table.cc,tests/api_backend.cc: Fix handling of
	  invalid block sizes - the size gets fixed as documented, but the
	  uncorrected size was passed to the base file.  Also, abort() was
	  called on 0.

Thu Dec 19 08:50:33 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/runtest.in: Report if a test is being run under eatmydata,
	  like we do for running under valgrind.

Thu Dec 19 08:47:05 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_version.h,backends/chert/chert_version.h,
	  backends/flint/flint_version.h: Comment out unused set_uuid() and
	  set_uuid_string() methods - they may be useful in future, but we
	  aren't currently using them.  Also make set_uuid() take a const
	  pointer.

Thu Dec 19 08:41:02 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* HACKING,configure.ac,tests/runtest.in: Automatically probe for and
	  hook in eatmydata to the testsuite using the wrapper script it now
	  includes.

Thu Dec 19 08:22:16 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* HACKING: Update website update info.

Mon Dec 16 10:40:12 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* matcher/msetcmp.cc: Fix sense of reverse parameter to
	  Enquire::set_sort_by_relevance_then_value.  Reported by "boomboo" on
	  IRC.
	* tests/api_db.cc: Fix testcase sortrel1.

Mon Dec 16 09:34:14 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Improve reporting of GCC version.

Fri Dec 13 08:45:00 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* weight/bm25weight.cc: Fix case where (k1 == 0 || b == 0) but k2 != 0.
	  Reported by "boomboo" on IRC.
	* tests/api_weight.cc: Add regression test bm25weight5.

Fri Dec 13 08:28:48 GMT 2013  Olly Betts <olly@survex.com>

	* AUTHORS: Update missed from 1.2.16.

Wed Dec 04 05:14:35 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/Makefile.am: doxygen no longer generates any GIF files, so
	  stop trying to ship or install them.

Wed Dec 04 02:53:35 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS,docs/doxygen_api.conf.in: Use doxygen 1.8.5 to generate
	  docs for releases.

Wed Dec 04 02:22:55 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS,include/xapian/enquire.h,include/xapian/keymaker.h:
	  Improve how descriptions of deprecated features appear in the API
	  documentation.

Tue Dec 03 23:08:06 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Final update for 1.2.16.

Tue Dec 03 23:04:16 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Clarify version of MSVCRT which we require for mingw.

Sat Nov 30 03:16:44 GMT 2013  Olly Betts <olly@survex.com>

	* backends/flint/flint_values.cc: Fix -Wcast-qual warning from GCC 4.7
	  when configured with --enable-log.

Fri Nov 29 20:18:48 GMT 2013  Olly Betts <olly@survex.com>

	* net/tcpclient.cc,net/tcpserver.cc: Fix not to include <sys/socket.h>
	  under __WIN32__.

Fri Nov 29 04:23:56 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* configure.ac: Report GCC version.
	* configure.ac: Fix typo in previous commit.

Fri Nov 29 01:08:12 GMT 2013  Olly Betts <olly@survex.com>

	* configure.ac: Update for 1.2.16.

Thu Nov 28 06:06:45 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update from ChangeLog.

Wed Nov 27 08:17:49 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from chert:
	* backends/flint/flint_table.cc: Check if the block we want is in the
	  internal cursor for a read-only table too - it isn't needed for
	  correctness in this case, but it is more efficient not to reload a
	  block which we already have.

Wed Nov 27 08:08:17 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* Backport change from brass:
	* backends/chert/chert_table.cc: Check if the block we want is in the
	  internal cursor for a read-only table too - it isn't needed for
	  correctness in this case, but it is more efficient not to reload a
	  block which we already have.

Wed Nov 27 08:05:25 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_table.cc: Check if the block we want is in the
	  internal cursor for a read-only table too - it isn't needed for
	  correctness in this case, but it is more efficient not to reload a
	  block which we already have.

Wed Nov 27 03:08:30 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* queryparser/queryparser.lemony: Minor tweak to structuring of tests
	  in check_infix().

Wed Nov 27 02:53:52 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_table.cc,backends/chert/chert_table.cc,
	  backends/flint/flint_table.cc: Add check for the database being
	  closed in read_block(), which fixes pythontest.py testcase
	  valuemods.

Wed Nov 27 02:28:06 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_values.cc,backends/brass/brass_values.h,
	  backends/chert/chert_values.cc,backends/chert/chert_values.h: Reuse
	  a cursor for reading values from valuestreams rather than creating
	  a new one each time.  This can dramatically reduce the number of
	  blocks redundantly reread when sorting by value.  The rereads will
	  generally get served from VM cache, but there's still an overhead
	  to that.

Wed Nov 27 02:12:42 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* examples/quest.cc: Add --check-at-least option to quest.

Wed Nov 27 02:07:45 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* configure.ac,tests/soaktest/soaktest.cc: If srandom() and random()
	  aren't available, use srand() and rand() instead.
	* common/safewindows.h: Define WINVER to 0x0500 if not otherwise set,
	  so we get new interfaces like MEMORYSTATUSEX under mingw.
	* tests/harness/backendmanager_remotetcp.cc: Need cstdlib for free
	  under mingw.
	* configure.ac,tests/api_replicate.cc,tests/queryparsertest.cc,
	  tests/termgentest.cc: Probe for _putenv_s() in configure as mingw
	  doesn't provide it.
	* configure.ac: Don't unset CC as it's used by libtool under mingw.

Wed Nov 27 01:29:37 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* net/tcpserver.cc: Fix mingw build error.

Wed Nov 27 01:04:36 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/omassert.h: Suppress "unused local typedef" warnings from
	  GCC 4.8.

Wed Nov 27 00:58:30 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/omassert.h: If the compiler supports C++11, use
	  static_assert to implement CompileTimeAssert.

Wed Nov 27 00:38:58 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* net/tcpclient.cc: Fix mingw build errors.

Thu Oct 31 12:52:27 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/win32_uuid.cc: Fix mingw compiler warning.

Thu Oct 31 12:39:03 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/flint_lock.cc: Under cygwin, use cygwin_conv_path() if
	  using a new enough cygwin version, rather than the now deprecated
	  cygwin_conv_to_win32_path().  Reported by "Haroogan" on the
	  xapian-devel mailing list.

Thu Oct 31 12:30:29 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update.

Mon Oct 21 22:58:50 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Simplify test for uuid_unparse_lower().  (see #626)

Mon Oct 21 22:08:13 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* Makefile.am,configure.ac: Split XAPIAN_LIBS out of XAPIAN_LDFLAGS.
	  (fixes#626)

Mon Oct 21 20:00:35 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* include/xapian/enquire.h,include/xapian/unicode.h: Mark internal
	  methods which are public for implementation convenience as
	  "@private" for doxygen where they weren't already.

Fri Oct 11 10:05:58 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/zlib-vg.c: Fix two warnings when compiled with clang.

Mon Oct 07 07:10:48 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update from ChangeLog.

Mon Oct 07 01:07:00 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Enable -fshow-column for GCC - things like vim's
	  quickfix mode will then jump to the appropriate column for a
	  compiler error or warning, not just the appropriate line.

Fri Oct 04 08:58:04 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_check.cc,backends/chert/chert_check.cc,
	  backends/flint/flint_check.cc: Fix xapian-check to report block
	  numbers correctly for links within the B-tree.

Fri Oct 04 06:55:01 GMT 2013  Olly Betts <olly@survex.com>

	* bin/xapian-check-chert.cc,bin/xapian-check-brass.cc,
	  bin/xapian-check-flint.cc: If the METAINFO key is missing, only
	  report it once per table.

Fri Oct 04 06:33:25 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* queryparser/queryparser.lemony: Fix comment typo.

Fri Oct 04 06:30:42 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* .gitignore,xapian-core.spec.in: Update two references to .tar.gz
	  files.

Fri Oct 04 06:29:14 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/install.rst: Fix typo (bogus extra 'and');

Fri Oct 04 06:27:39 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac,docs/install.rst: Compress source tarballs with xz
	  instead of gzip.

Sun Sep 29 16:44:46 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/,backends/chert/,backends/flint,backends/dbcheck.cc:
	  Fix database consistency checking to always open all the tables at
	  the same revision, which could lead to false errors being reported
	  after a commit interrupted by the process being killed or the
	  machine crashing.  Reported by Joey Hess in
	  http://bugs.debian.org/724610

Sun Sep 22 07:35:42 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update for changes since 1.2.15.

Fri Sep 20 09:21:37 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* include/xapian/unicode.h: Document how Utf8Iterator handles invalid
	  UTF-8.

Fri Sep 20 09:09:11 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/queryparsertest.cc: Add test coverage for explicit synonym of
	  a term with a prefix (e.g. ~foo:search).

Mon Sep 16 11:50:28 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* api/valueiterator.cc,tests/api_backend.cc: Don't segfault is
	  skip_to() or check() are called on a ValueIterator which is already
	  at_end().
	* api/ompositionlistiterator.cc,api/ompostlistiterator.cc,
	  tests/api_backend.cc: Don't segfault if skip_to() is called on an
	  iterator which is already at_end().  Reported by David Bremner.

Mon Sep 16 11:28:17 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* tests/queryparsertest.cc: Fix previous change to compile.
	* tests/queryparsertest.cc: Change qp_scale1 to time 5 repetitions of
	  the large query to help average out variations.

Mon Sep 16 10:59:02 GMT 2013  Olly Betts <olly@survex.com>

	* tests/api_serialise.cc: Fix up bad application of recent backport to
	  this file.

Mon Sep 16 10:48:05 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/harness/testsuite.cc,tests/harness/testsuite.h: If
	  -v/--verbose is specified more than once, show the diagnostic output
	  for passing tests as well as failing/skipped ones.

Mon Sep 16 10:22:53 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/matchspy.cc: Fix get_description() to work on a
	  ValueCountMatchSpy with NULL internals - fixes matchspy5 testcase
	  with remote backends when configured with --enable-log.
	* api/matchspy.cc: Add assertions that internal is non-NULL before
	  using it.
	* include/xapian/matchspy.h: If internal is NULL, make
	  ValueCountMatchSpy::get_total() return 0 rather than dereferencing
	  NULL.

Mon Sep 02 09:39:34 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/dbfactory.cc: Fix 'unused label' warning when chert backend
	  is disabled.

Mon Sep 02 09:20:35 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/api_serialise.cc: Remove code from registry* testcases which
	  tries to test the consequences of throwing an exception from a
	  destructor - it's complex to ensure we don't leak memory while doing
	  this (it seems GCC doesn't release the object in this case, but
	  clang does), and it's generally frowned upon, plus C++11 makes
	  destructors noexcept by default.

Mon Sep 02 08:08:57 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/Makefile.am: Fix to actually removed cached databases before
	  "make check".

Sun Sep 01 09:06:53 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/safeuuid.h: Make a few tweaks to support AIX.

Sun Sep 01 09:02:09 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/safeuuid.h: Remove bogus take-address-of from uuid handling
	  code for netbsd and openbsd.

Sun Sep 01 08:59:03 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/safeuuid.h: Add missing '#include <cstdlib>' and qualify free
	  with std.

Sun Sep 01 08:48:43 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/error.cc,common/Makefile.mk,common/safenetdb.h,net/tcpclient.cc,
	  net/tcpserver.cc: AIX needs _USE_IRS defined for hstrerror, so
	  create safenetdb.h to take care of that.

Sun Sep 01 08:44:46 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* matcher/andmaybepostlist.cc,matcher/multiandpostlist.h: Fix
	  assertion failure for when an OrPostList decays to an AndPostList
	  - the ordering of the subqueries by estimated termfreq may not be
	  the same as it was when the OrPostList was constructed, as the
	  subqueries may themselves have decayed.  Reported by Michel
	  Pelletier.

Sun Sep 01 06:29:20 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* m4-macros/xapian-1.3.m4: Handle empty or unset XAPIAN_CONFIG
	  correctly.

Fri Aug 30 08:32:55 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac,m4-macros/xapian-1.3.m4: Fix stripping of _git suffix
	  from snapshot versions not to relying of sed having support for \|
	  as it doesn't on OS X.

Fri Jul 12 08:18:15 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* m4-macros/xapian-1.3.m4: XO_LIB_XAPIAN now handles the user
	  specifying a relative path in XAPIAN_CONFIG, e.g.: "./configure
	  XAPIAN_CONFIG=../xapian-core/xapian-config"

Thu Jul 11 13:02:51 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* m4-macros/xapian-1.3.m4: Fix comment typo.

Thu Jul 11 12:37:51 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: clang doesn't support -Wstrict-null-sentinel or
	  -Wlogical-op, so don't pass it these options.

Thu Jul 11 12:28:02 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_compact.cc,backends/chert/chert_compact.cc:
	  Fix failure when built with -D_GLIBCXX_DEBUG - we were modifying
	  the top() element of a heap before calling pop(), such that the
	  heap comparison operation (which is called when -D_GLIBCXX_DEBUG
	  is on to verify the heap is valid) would read off the end of the
	  data.  In a normal build, this issue would likely never manifest.

Thu Jul 11 11:48:22 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* preautoreconf: Remove needless use of perl prototype.

Thu Jul 11 11:45:15 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: When generating ABI compatibility checks in
	  xapian/version.h, pass $CXXFLAGS and $CPPFLAGS to $CXXCPP as they
	  could contain options which affect the ABI (such as -fabi-version
	  for GCC).  (Fixes #622)

Thu Jul 11 11:37:19 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/win32_uuid.cc: Microsoft GUIDs in binary form have reversed
	  byte order in the first three components compared to standard UUIDs,
	  so the same database would report a different UUID on Windows to
	  on other platforms.  With this fix, the UUIDs of existing databases
	  will appear to change on Windows (except in rare "palindronic" cases).

Thu Jul 11 11:35:14 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/overview.rst: Correct documentation for stub files specifying
	  "prog" remote databases.

Thu Jul 11 11:17:34 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* HACKING,INSTALL,Makefile.am,README,docs/Makefile.am,docs/install.rst,
	  docs/stemming.rst,languages/Makefile.mk,queryparser/Makefile.mk,
	  tests/Makefile.am,tests/perftest/perftest.cc: SVN -> git.

Thu Jul 11 03:39:49 GMT 2013  Olly Betts <olly@survex.com>

	* bin/xapian-chert-update.cc: Documented alias --blocksize for -b has
	  never actually been supported, so just drop mentions of it from
	  --help and the man page.

Thu Jul 11 03:36:57 GMT 2013  Olly Betts <olly@survex.com>

	* bin/xapian-chert-update.cc: Fix -b to work rather than always
	  segfaulting (reported in http://bugs.debian.org/716484).

Thu Jul 11 03:32:37 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* backends/chert/chert_dbcheck.cc: Code tweak for clarity.
	* backends/chert/chert_dbcheck.cc: Fix database check that first docid
	  in each doclength chunk is more than the last docid in the previous
	  chunk - previously this didn't actually work.
	* common/bitstream.h: Fix database check not to falsely report
	  "position table: Junk after position data" whenever there are 7
	  unused bits (7 is OK, *more* than 7 isn't).

Mon May 27 00:02:54 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* m4-macros/xapian-1.3.m4: Adjust XO_LIB_XAPIAN to strip _gitNNN
	  suffix from snapshot versions.

Sat May 25 07:30:26 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* configure.ac: Handle git snapshot naming when calculating REVISION.
	* configure.ac: Simplify previous change.

Sat May 25 07:03:34 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_version.cc,backends/chert/chert_version.cc:
	  Remove unused '#include <cstdio>'.

Wed May 01 05:14:16 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* include/xapian.h: Add catch for Wt defining a macro called slots,
	  like we already do for Qt.

Mon Apr 29 11:27:54 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/remote_protocol.rst: Correct error in documentation of
	  REPLY_DOCDATA message.

Sun Apr 28 09:08:23 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* include/xapian/version_h.cc: Fix typo in doc comment.

Tue Apr 16 23:07:10 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS,configure.ac: Update for 1.2.15.

Tue Apr 16 10:10:30 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update from ChangeLog.

Tue Apr 16 06:27:59 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_version.cc,backends/chert/chert_version.cc,
	  backends/flint/flint_version.cc: Call io_sync() on the version file
	  when we create it.

Mon Apr 15 09:09:17 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* bin/xapian-delve.cc: If -v is specified more than once, show even
	  more info in some cases.

Wed Apr 10 08:11:36 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* m4-macros/xapian.m4: XO_LIB_XAPIAN now handles the user
	  specifying XAPIAN_CONFIG without a path - e.g.: "./configure
	  XAPIAN_CONFIG=xapian-config-1.3"

Tue Apr 02 10:25:43 GMT 2013  Olly Betts <olly@survex.com>

	* queryparser/lemon.c: Fix lemon pointer truncation bug, which
	  probably affects WIN64.

Wed Mar 27 08:51:22 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* queryparser/queryparser.lemony: std::less provides a total order over
	  pointers, so we can just use that to implement
	  filter_group_id::operator<() - we only need a consistent order so we
	  can use it as the key to a std::map.

Tue Mar 26 09:54:44 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_table.cc,backends/chert/chert_table.cc,
	  common/pretty.h: Avoid needlessly casting away const-ness in
	  debug logging.

Tue Mar 26 08:00:44 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/registry.cc: No need to explicitly default initialise std::map
	  members or the base class.

Tue Mar 26 01:31:08 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* queryparser/cjk-tokenizer.cc,queryparser/termgenerator_internal.cc,
	  tests/termgentest.cc: Some CJK codepoints are also punctuation and
	  hence not word characters, and should not really be used as fodder
	  for generating N-grams.  Also fixes a pre-existing bug where every
	  second sequence of N-grammable CJK characters in the text failed to
	  generate the first 2-gram.
	* tests/queryparsertest.cc: Add test coverage for change to
	  QueryParser CJK handling in previous commit.

Mon Mar 25 11:10:26 GMT 2013  Olly Betts <olly@survex.com>

	* matcher/multiandpostlist.cc,matcher/multixorpostlist.cc: Fix to
	  build when configured with --enable-log.

Thu Mar 14 23:21:10 GMT 2013  Olly Betts <olly@survex.com>

	* AUTHORS: Update for 1.2.14.

Thu Mar 14 22:36:40 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS,configure.ac: Update for 1.2.14.

Thu Mar 14 12:26:45 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/api_anydb.cc: Added tradweight4 testcase to test TradWeight
	  with an RSet for weighting documents.

Thu Mar 14 12:20:00 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* HACKING: gs package has been replaced by ghostscript package in
	  current Debian and Ubuntu releases.

Fri Mar 08 08:50:56 GMT 2013  Olly Betts <olly@survex.com>

	* backends/flint/flint_compact.cc: Apply same fix for flint.

Fri Mar 08 08:25:47 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_compact.cc,backends/chert/chert_compact.cc: Fix
	  multipass compaction not to damage document values, and to merge the
	  database stats correctly.  (fixes #615)
	* tests/api_compact.cc: Add regression test compactmultipass1.

Thu Mar 07 09:39:14 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update from ChangeLog.

Sat Feb 16 08:14:04 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* matcher/selectpostlist.cc,matcher/selectpostlist.h: Check document
	  matches weight threshold before checking positional information,
	  which speeds up slow phrase searches (tweaked version of
	  positional-query-weight-check-first.patch from #394).

Sat Feb 16 02:30:35 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/api_stem.cc: Extend stem2 to ensure description of the stemmer
	  isn't the same as the description of Stem("none").  Fix description
	  of testcase stemlangs2.

Sat Feb 16 02:15:30 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* HACKING: Update link to new home of autotools tutorial.

Sat Feb 16 02:10:53 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/omenquire.cc: Don't cache documents retrieved by
	  MSet::get_document() unless they were requested with fetch().  This
	  avoids using a lot of memory when many MSet entries are retrieved.
	  (Fixes #604)

Fri Feb 15 07:36:50 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/realtime.h: Fix RealTime::sleep() to calculate the delta to
	  the time we want to sleep to the right way round.  Previously we
	  wouldn't sleep if we were before the deadline, but would sleep if
	  the deadline had already passed (and by the amount the deadline had
	  passed)!  And on Windows, fix the sleep to be for the delta rather
	  than 43+ years (the time elapsed since the start of 1970).  (Fixes
	  #472)

Fri Feb 15 07:33:47 GMT 2013  Olly Betts <olly@survex.com>

	* matcher/queryoptimiser.cc: Need <functional> for mem_fun().

Fri Feb 15 07:31:21 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* tests/harness/testsuite.cc: Don't provide explicit template types to
	  make_pair - it isn't useful, and breaks with C++11.  Fixes build
	  error with MSVC2012.

Mon Jan 28 01:51:01 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* examples/quest.cc: Fix to build with Sun Studio 12 compiler.
	  (ticket#611)

Mon Jan 28 01:47:47 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Fix some typos in older entries.

Wed Jan 09 11:31:52 GMT 2013  Olly Betts <olly@survex.com>

	* AUTHORS: Update for 1.2.13.

Wed Jan 09 11:13:34 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS,configure.ac: Updated for 1.2.13.

Wed Jan 09 07:40:06 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Format new entries.

Tue Jan 08 10:10:43 GMT 2013  Olly Betts <olly@survex.com>

	* NEWS: Update from ChangeLog.

Tue Jan 08 09:14:54 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Expand comment about DJGPP.

Tue Jan 08 09:13:51 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Update comment - we've supported the prog backend on
	  Windows for more than 5 years now!

Tue Jan 08 09:05:56 GMT 2013  Olly Betts <olly@survex.com>

	* backends/brass/brass_database.cc,backends/chert/chert_database.cc,
	  backends/flint/flint_database.cc,net/remoteconnection.cc,
	  tests/api_replicate.cc: Pass O_BINARY when opening replication
	  related files in some places where we weren't before, which will
	  probably help solve bugs such as #472.  Changes are roughly
	  equivalent in effect to r16961 and r16962 on trunk, but done in a
	  very different way to be less invasive.

Mon Jan 07 11:48:41 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/remote/remote-database.cc: Make the UnimplementedError for a
	  MatchSpy which doesn't implement name() clearer that it's this
	  particular subclass which can't be used remotely, not all MatchSpy
	  objects.

Mon Jan 07 11:46:54 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: Use user-specified LIBS for configure tests, which is
	  what's expected, and provides a way for the user to tell configure
	  where to find library functions which configure can't find for
	  itself.

Mon Jan 07 10:56:18 GMT 2013  Olly Betts <olly@survex.com>

	* bin/Makefile.mk: Fix srcdir != builddir build (broken by INCLUDES
	  to AM_CPPFLAGS change).

Mon Jan 07 10:38:02 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_databasereplicator.cc,
	  backends/chert/chert_databasereplicator.cc: Simplify how we open the
	  .DB file on the replication slave to just call open() once with
	  O_CREAT, rather than once without, than stat() if that fails, and
	  then again with O_CREAT|O_TRUNC if stat() doesn't show an ordinary
	  file exists.

Mon Jan 07 10:31:44 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/compactor.cc,common/,languages/compiler/syswords2.h,
	  tests/api_compact.cc: Remove extra blank lines at end of files.

Mon Jan 07 10:26:56 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_database.cc,backends/chert/chert_database.cc:
	  Fix "if (fd > 0)" tests to be "if (fd >= 0)" in code related to
	  replication.  In practice this is unlikely to actually have caused
	  problems in real world cases.

Mon Jan 07 10:20:02 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* Makefile.am,languages/Makefile.mk,queryparser/Makefile.mk,
	  tests/Makefile.am: In automake, INCLUDES is now deprecated in favour
	  of AM_CPPFLAGS so update to use the latter.
	* bin/Makefile.mk: INCLUDES is always used, AM_CPPFLAGS
	  isn't if there are per-executable CPPFLAGS, so add AM_CPPFLAGS
	  explicitly when we use per-executable CPPFLAGS.

Mon Jan 07 09:08:01 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* examples/quest.cc: Add --flags command line option to allow setting
	  arbitrary QueryParser flags.
	* examples/quest.cc: Need <algorithm> for lower_bound().
	* examples/quest.cc: Align option descriptions in --help output, and
	  make the initial letter of such descriptions consistently lowercase.

Mon Jan 07 08:52:14 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/valuerangeproc.cc: Move 3 declarations to where we first use the
	  variables.

Mon Jan 07 08:46:00 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* matcher/multimatch.cc: We no longer use the highest weighted
	  MSet entry to calculate percentages, so stop searching for it.
	  (Spotted by cppcheck)

Mon Jan 07 08:28:36 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/brass/brass_compact.cc,backends/chert/chert_compact.cc:
	  Remove unused variables (spotted by cppcheck).

Mon Jan 07 08:23:56 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* api/maptermlist.h,api/matchspy.cc,api/omdatabase.cc,
	  backends/inmemory/inmemory_database.cc,
	  backends/inmemory/inmemory_positionlist.cc,
	  backends/multi/multi_postlist.cc,backends/remote/net_termlist.cc,
	  bin/xapian-delve.cc,matcher/exactphrasepostlist.cc,
	  matcher/mergepostlist.cc,matcher/phrasepostlist.cc,
	  tests/harness/backendmanager.cc: Prefer ++i to i++.

Fri Jan 04 05:41:41 GMT 2013  Olly Betts <olly@survex.com>

	* Backport changes from trunk:
	* HACKING,Makefile.am: With lcov 1.10, we no longer need any of our
	  hacky workarounds, so make this a requirement and simplify the rules
	  in the makefile.
	* Makefile.am: Pass -f to lcov, which should avoid the need for the
	  patch we've been applying to lcov.

Fri Jan 04 03:54:07 GMT 2013  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* docs/quickstart.rst: Fix seriously outdated statement that Xapian
	  doesn't create the database directory - that changed in 0.7.2
	  (release 2003-07-11), pointed out by aarsh on #xapian.

Thu Dec 20 22:55:34 GMT 2012  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* configure.ac: socketpair() needs -lnetwork on Haiku.

Sun Dec 09 22:55:30 GMT 2012  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* backends/flint_lock.cc: Close excess file handles before we get the
	  fcntl() lock, just in case one of those file handles is open on the
	  lock file.
	* tests/api_backend.cc: Add regression test lockfilealreadyopen1.

Sun Dec 09 22:46:10 GMT 2012  Olly Betts <olly@survex.com>

	* Backport change from trunk:
	* common/closefrom.cc,configure.ac: On platforms with the F_MAXFD
	  fcntl but without closefrom(), we were failing to close the highest
	  numbered open fd in our closefrom() replacement.  We now also work
