[tracker/harmattan: 1309/2240] Merge branch 'master' into harmattan

[Martyn James Russell <mr src gnome org>]

commit 68885e54b537b13ed85cb12a2cf62c9140ca8a54
Merge: f832117 4b9ac3c
Author: Jürg Billeter <j bitron ch>
Date:   Thu Oct 15 17:01:19 2009 +0200

    Merge branch 'master' into harmattan

 Makefile.decl                                     |    2 +-
 configure.ac                                      |   23 ++-
 data/ontologies/11-rdf.ontology                   |    5 +
 data/ontologies/30-nie.ontology                   |    5 +-
 data/ontologies/31-nao.ontology                   |    3 +-
 data/ontologies/38-nmm.ontology                   |   14 +
 python/rss_reader/README                          |    7 +-
 python/rss_reader/initial-data.ttl                |    5 +-
 python/rss_reader/main.py                         |   12 +-
 python/rss_reader/signaler.py                     |   10 +-
 python/rss_reader/tracker_backend.py              |   20 +-
 src/libtracker-common/tracker-sparql-builder.vala |    2 +-
 src/libtracker-data/tracker-data-manager.c        |   28 ++-
 src/libtracker-data/tracker-data-update.c         |  162 +++++-------
 src/libtracker-data/tracker-data-update.h         |    5 -
 src/libtracker-data/tracker-sparql-query.vala     |   43 ++--
 src/libtracker-data/tracker-turtle-reader.vala    |   18 +-
 src/libtracker-db/tracker-db-interface-sqlite.c   |    1 +
 src/libtracker-miner/tracker-miner-fs.c           |    2 +
 src/tracker-search-tool/tracker-metadata-tile.gs  |   77 +++---
 src/tracker-search-tool/tst.ui                    |   62 ++----
 src/tracker-store/tracker-main.c                  |  279 +--------------------
 src/tracker-store/tracker-store.c                 |    2 +
 tests/Makefile.am                                 |    3 +-
 tests/functional-tests/01-insertion.py            |   70 +++++
 tests/functional-tests/Makefile.am                |   11 +
 tests/functional-tests/tests.xml                  |   26 ++
 tests/libtracker-data/tracker-ontology-test.c     |    2 +
 tests/libtracker-data/tracker-sparql-test.c       |    2 +
 tests/libtracker-fts/tracker-fts-test.c           |    2 +
 30 files changed, 376 insertions(+), 527 deletions(-)
---