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

[Martyn James Russell <mr src gnome org>]

commit 388f8653af19586b8af8a422deb8fd553b3332cc
Merge: 52065ef faca81f
Author: Martyn Russell <martyn lanedo com>
Date:   Thu May 27 16:03:05 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |   64 +
 configure.ac                                       |   39 +-
 data/ontologies/32-nco.ontology                    |    7 +
 data/ontologies/92-slo.description                 |   13 +
 data/ontologies/92-slo.ontology                    |  232 ++
 data/ontologies/Makefile.am                        |   12 +-
 docs/manpages/tracker-fts.cfg.5                    |    9 +
 docs/reference/ontology/Makefile.am                |    1 +
 docs/reference/ontology/ontology-docs.sgml         |    6 +-
 po/fr.po                                           | 2999 ++++++++++----------
 src/libtracker-data/tracker-data-manager.c         |  237 ++-
 src/libtracker-data/tracker-data-manager.h         |   71 +-
 src/libtracker-data/tracker-data-query.c           |   50 +-
 src/libtracker-data/tracker-data-update.c          |  332 ++-
 src/libtracker-db/libtracker-db.vapi               |    5 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |   91 +-
 src/libtracker-db/tracker-db-interface.c           |   18 +-
 src/libtracker-db/tracker-db-interface.h           |    8 +-
 src/libtracker-db/tracker-db-manager.c             |  138 +-
 src/libtracker-db/tracker-db-manager.h             |   36 +-
 src/libtracker-extract/tracker-utils.c             |   67 +-
 src/libtracker-extract/tracker-utils.h             |    4 +-
 src/libtracker-extract/tracker-xmp.c               |   95 +-
 src/libtracker-fts/README.parsers                  |   51 +
 src/libtracker-fts/tracker-fts-config.c            |  102 +-
 src/libtracker-fts/tracker-fts-config.h            |    6 +
 src/libtracker-fts/tracker-fts.c                   |   23 +-
 src/libtracker-fts/tracker-parser-glib.c           |   14 +-
 src/libtracker-fts/tracker-parser-libicu.c         |    9 +-
 src/libtracker-fts/tracker-parser-libunistring.c   |    9 +-
 src/libtracker-fts/tracker-parser.h                |    2 +-
 src/libtracker-miner/tracker-miner-fs.c            |    9 +-
 src/miners/fs/Makefile.am                          |    1 +
 src/miners/fs/tracker-miner-files.c                |  104 +-
 src/tracker-extract/tracker-extract-gif.c          |   65 +-
 src/tracker-extract/tracker-extract-html.c         |   16 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   66 +-
 src/tracker-extract/tracker-extract-pdf.cpp        |   76 +-
 src/tracker-extract/tracker-extract-playlist.c     |    2 +-
 src/tracker-extract/tracker-extract-png.c          |   63 +-
 src/tracker-extract/tracker-extract-tiff.c         |   67 +-
 src/tracker-preferences/tracker-preferences.vala   |    8 +-
 src/tracker-search-tool/tracker-entry.gs           |   32 +-
 src/tracker-search-tool/tracker-metadata-tile.gs   |    9 +-
 src/tracker-store/tracker-store.c                  |    4 +-
 src/tracker-utils/tracker-import.c                 |    2 +-
 src/tracker-utils/tracker-info.c                   |    2 +-
 src/tracker-utils/tracker-search.c                 |   18 +-
 src/tracker-utils/tracker-sparql.c                 |    2 +-
 src/tracker-utils/tracker-stats.c                  |    2 +-
 src/tracker-utils/tracker-status.c                 |    4 +-
 src/tracker-utils/tracker-tag.c                    |    2 +-
 src/tracker-writeback/tracker-writeback-xmp.c      |   14 +-
 tests/libtracker-data/nie/filter-description-1.out |   15 +
 tests/libtracker-data/nie/filter-title-1.out       |   15 +
 tests/libtracker-data/tracker-backup-test.c        |    4 +-
 tests/libtracker-data/tracker-ontology-test.c      |    4 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    2 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-fts/.gitignore                    |    4 +-
 tests/libtracker-fts/tracker-fts-test.c            |    2 +-
 tests/libtracker-fts/tracker-parser-test.c         |  130 +-
 tests/libtracker-fts/tracker-parser.c              |   31 +-
 utils/playlists/playlist2ttl.c                     |    2 +-
 64 files changed, 3360 insertions(+), 2169 deletions(-)
---