[tracker/harmattan-pre-signal-updates: 798/1380] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 25f173379d13732148f7c1fa19459e83ea8b46e7
Merge: 0d83b55 99fb32c
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Jul 16 15:14:22 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   47 +
 configure.ac                                       |   11 +-
 data/ontologies/11-rdf.ontology                    |    8 +-
 data/ontologies/32-nco.ontology                    |    1 -
 data/ontologies/38-nmm.ontology                    |    3 +-
 data/ontologies/Indices.list                       |    3 +
 .../libtracker-miner/libtracker-miner-sections.txt |    3 +
 po/cs.po                                           |  400 ++--
 po/de.po                                           |  113 +-
 po/pt.po                                           | 3106 +++++++++-----------
 src/libtracker-client/tracker.c                    |   14 +-
 src/libtracker-common/tracker-keyfile-object.c     |   77 +-
 src/libtracker-common/tracker-keyfile-object.h     |    2 +
 src/libtracker-common/tracker-os-dependant-unix.c  |    9 +-
 src/libtracker-common/tracker-os-dependant.h       |    1 +
 src/libtracker-data/libtracker-data.vapi           |    2 +
 src/libtracker-data/tracker-class.c                |   90 +-
 src/libtracker-data/tracker-class.h                |   56 +-
 src/libtracker-data/tracker-data-backup.c          |  281 ++-
 src/libtracker-data/tracker-data-manager.c         |  466 +++-
 src/libtracker-data/tracker-data-manager.h         |    9 +-
 src/libtracker-data/tracker-data-update.c          |   81 +-
 src/libtracker-data/tracker-property.c             |   99 +
 src/libtracker-data/tracker-property.h             |  125 +-
 src/libtracker-data/tracker-sparql-pattern.vala    |   28 +-
 src/libtracker-db/Makefile.am                      |    6 +-
 src/libtracker-db/tracker-db-config.c              |  400 +++
 src/libtracker-db/tracker-db-config.h              |   70 +
 src/libtracker-db/tracker-db-journal.c             | 1460 +++++++---
 src/libtracker-db/tracker-db-journal.h             |   12 +-
 src/libtracker-db/tracker-db-manager.c             |  195 ++-
 src/libtracker-db/tracker-db.h                     |    1 +
 src/libtracker-fts/tracker-fts.c                   |   87 +-
 src/libtracker-miner/tracker-miner-fs.c            |  435 +++-
 src/libtracker-miner/tracker-miner-fs.h            |    5 +
 src/libtracker-miner/tracker-miner-object.c        |   30 +-
 src/libtracker-miner/tracker-miner-object.h        |    6 +-
 src/libtracker-miner/tracker-monitor.c             |   28 +-
 src/miners/fs/tracker-miner-files.c                |  106 +-
 src/tracker-control/tracker-control.c              |   17 +
 src/tracker-extract/Makefile.am                    |    4 +-
 src/tracker-extract/tracker-extract-msoffice.c     |   18 +-
 src/tracker-extract/tracker-extract-pdf.cpp        |   88 +-
 src/tracker-search-tool/tracker-metadata-tile.gs   |   48 +-
 src/tracker-store/tracker-config.c                 |   12 +-
 src/tracker-store/tracker-config.h                 |   13 +-
 src/tracker-store/tracker-main.c                   |   32 +
 src/tracker-utils/tracker-search.c                 |  104 +-
 tests/libtracker-data/Makefile.am                  |   24 +-
 tests/libtracker-data/change/change-test-1.out     |    1 +
 tests/libtracker-data/change/change-test-1.rq      |    1 +
 tests/libtracker-data/change/change-test-2.out     |    3 +
 tests/libtracker-data/change/change-test-2.rq      |    3 +
 tests/libtracker-data/change/change-test-3.out     |    3 +
 tests/libtracker-data/change/change-test-3.rq      |    3 +
 .../change/source/99-example.ontology.v2           |    4 +
 .../change/source/99-example.ontology.v3           |    3 +
 .../change/source/99-example.ontology.v4           |   14 +
 .../change/source/99-example.ontology.v5           |   55 +
 .../change/source/99-example.ontology.v6           |   55 +
 .../change/source/99-example.ontology.v7           |   55 +
 tests/libtracker-data/change/test-4.out            |    1 +
 tests/libtracker-data/change/test-4.rq             |    1 +
 tests/libtracker-data/change/test-5.out            |    1 +
 tests/libtracker-data/change/test-5.rq             |    1 +
 .../change/updates/99-example.queries.v5           |    1 +
 .../change/updates/99-example.queries.v6           |    1 +
 tests/libtracker-data/tracker-backup-test.c        |    4 +
 .../libtracker-data/tracker-ontology-change-test.c |  365 +++
 tests/libtracker-data/tracker-ontology-test.c      |  252 +--
 tests/libtracker-data/tracker-sparql-blank-test.c  |    2 +
 tests/libtracker-data/tracker-sparql-test.c        |    3 +
 tests/libtracker-db/tracker-db-journal.c           |    5 +-
 tests/libtracker-fts/tracker-fts-test.c            |    1 +
 tests/libtracker-miner/miners-mock.c               |    1 +
 75 files changed, 6134 insertions(+), 2941 deletions(-)
---