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

[Martyn James Russell <mr src gnome org>]

commit ab42c703603c444588095c8f9ddca5f3449a21af
Merge: d964328 23fe132
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jun 10 16:31:32 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   41 ++
 configure.ac                                       |  452 +++++++-------
 docs/ontologies/nie/explanation.xml                |    2 +-
 po/sl.po                                           |  669 ++++----------------
 src/libtracker-client/tracker-sparql-builder.vala  |   10 +
 src/libtracker-data/tracker-data-update.c          |    2 +-
 src/libtracker-data/tracker-sparql-expression.vala |    2 +-
 src/libtracker-data/tracker-sparql-pattern.vala    |   46 ++-
 src/libtracker-db/tracker-db-manager.c             |  136 ++++-
 src/libtracker-db/tracker-db-manager.h             |    6 +-
 src/libtracker-extract/tracker-xmp.c               |    2 +-
 src/libtracker-miner/tracker-miner-fs.c            |   13 +-
 src/libtracker-miner/tracker-miner-fs.h            |    2 +
 src/miners/flickr/tracker-miner-flickr.vala        |    2 +-
 src/miners/fs/tracker-main.c                       |   35 +-
 src/miners/fs/tracker-miner-applications.c         |    8 +-
 src/miners/fs/tracker-miner-files.c                |   44 +-
 src/tracker-extract/tracker-albumart.c             |    4 +-
 src/tracker-extract/tracker-extract-gif.c          |    2 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |   41 ++-
 src/tracker-extract/tracker-extract-jpeg.c         |    2 +-
 src/tracker-extract/tracker-extract-pdf.cpp        |    2 +-
 src/tracker-extract/tracker-extract-png.c          |    2 +-
 src/tracker-extract/tracker-extract-tiff.c         |    2 +-
 tests/functional-tests/metadata_extraction_tc.py   |    2 +-
 tests/functional-tests/performance-tc.py           |   12 +-
 tests/functional-tests/writeback-tc.py             |   12 +-
 tests/libtracker-data/algebra/Makefile.am          |    2 +
 .../algebra/filter-placement-3a.out                |    1 +
 .../libtracker-data/algebra/filter-placement-3a.rq |   11 +
 tests/libtracker-data/expr-ops/Makefile.am         |    4 +-
 tests/libtracker-data/expr-ops/data.ontology       |    3 +
 tests/libtracker-data/expr-ops/data.ttl            |    5 +
 tests/libtracker-data/expr-ops/query-res-1.out     |    1 +
 tests/libtracker-data/expr-ops/query-res-1.rq      |    5 +
 tests/libtracker-data/graph/Makefile.am            |    4 +-
 tests/libtracker-data/graph/graph-4.out            |    3 +
 tests/libtracker-data/graph/graph-4.rq             |    5 +
 tests/libtracker-data/tracker-sparql-test.c        |    3 +
 tests/tracker-writeback/01-writeback.py            |    2 +-
 utils/data-generators/cc/nmm.py                    |    2 +-
 utils/data-generators/cc/nmo.py                    |   12 +-
 utils/data-generators/deprecated/generate_Image.py |    2 +-
 utils/services/file-class.cache.test               |    2 +-
 44 files changed, 686 insertions(+), 934 deletions(-)
---