[tracker/tracker-0.10: 32/32] Merge branch 'checkpoint' into tracker-0.10

[Martyn James Russell <mr src gnome org>]

commit 89539794544fe2175eff49c0b7f681f73f974d76
Merge: 2704965 e545139
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jun 30 09:47:11 2011 +0100

    Merge branch 'checkpoint' into tracker-0.10

 configure.ac                                       |   23 ++
 src/libtracker-data/Makefile.am                    |    2 +
 src/libtracker-data/libtracker-data.vapi           |    9 +-
 src/libtracker-data/tracker-data-backup.c          |  288 ++++++++++++++++--
 src/libtracker-data/tracker-data-manager.c         |   95 ++++--
 src/libtracker-data/tracker-data-manager.h         |    1 +
 src/libtracker-data/tracker-data-update.c          |   53 +++-
 src/libtracker-data/tracker-db-backup.c            |  186 +++++++++++
 src/libtracker-data/tracker-db-backup.h            |   49 +++
 src/libtracker-data/tracker-db-interface-sqlite.c  |   17 +
 src/libtracker-data/tracker-db-interface-sqlite.h  |    4 +
 src/libtracker-data/tracker-db-journal.c           |  121 +++++++-
 src/libtracker-data/tracker-db-manager.c           |  331 ++++----------------
 src/libtracker-data/tracker-db-manager.h           |    4 +-
 src/libtracker-direct/tracker-direct.vala          |    2 +-
 src/tracker-control/tracker-control-general.c      |   15 +-
 src/tracker-store/tracker-main.vala                |    1 +
 src/tracker-store/tracker-resources.vala           |    3 +
 src/tracker-store/tracker-store.vala               |   88 +++++-
 tests/functional-tests/17-ontology-changes.py      |   10 +-
 tests/functional-tests/200-backup-restore.py       |    4 +-
 .../common/utils/configuration.py.in               |    1 +
 .../common/utils/expectedFailure.py                |   20 ++
 tests/functional-tests/common/utils/system.py      |   11 +-
 tests/libtracker-data/tracker-backup-test.c        |   19 +-
 tests/libtracker-data/tracker-db-journal.c         |    9 +
 .../libtracker-data/tracker-ontology-change-test.c |    6 +-
 tests/libtracker-data/tracker-ontology-test.c      |    3 +
 tests/libtracker-data/tracker-sparql-blank-test.c  |    1 +
 tests/libtracker-data/tracker-sparql-test.c        |    3 +-
 tests/libtracker-fts/tracker-fts-test.c            |    3 +-
 utils/tracker-sql/tracker-sql.c                    |    1 +
 32 files changed, 1020 insertions(+), 363 deletions(-)
---