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

[Martyn James Russell <mr src gnome org>]

commit d61874dc30a1ba17aac6c1e06019f6d9645184e2
Merge: 5438f5b 6359c8e
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Jun 3 16:32:04 2010 +0300

    Merge branch 'master' into harmattan

 NEWS                                               |   54 +
 configure.ac                                       |    2 +-
 data/ontologies/32-nco.ontology                    |    4 -
 data/ontologies/33-nfo.ontology                    |   10 +-
 data/ontologies/38-nmm.ontology                    |    5 +-
 docs/design/tracker-structural-view.dot            |    2 +
 docs/manpages/tracker-store.1                      |   13 +
 examples/rss-reader/main.py                        |    2 +-
 examples/rss-reader/signaler.py                    |    2 +-
 po/de.po                                           |  178 +-
 po/ja.po                                           | 2488 +++++++++++---------
 src/libtracker-common/libtracker-common.vapi       |   30 +
 src/libtracker-common/tracker-language.c           |   23 +-
 src/libtracker-data/Makefile.am                    |    2 +-
 src/libtracker-fts/tracker-fts.c                   |   48 +-
 src/libtracker-fts/tracker-parser-glib.c           |  213 +-
 src/libtracker-fts/tracker-parser-libicu.c         |  432 ++--
 src/libtracker-fts/tracker-parser-libunistring.c   |  317 ++--
 src/libtracker-fts/tracker-parser.h                |    9 +-
 src/libtracker-miner/tracker-miner-fs.c            |   67 +-
 src/libtracker-miner/tracker-miner-fs.h            |    5 +
 src/miners/fs/tracker-config.c                     |   54 +-
 src/miners/fs/tracker-config.h                     |    3 +
 src/miners/fs/tracker-main.c                       |   72 +
 src/miners/fs/tracker-miner-files.c                |   76 +-
 src/miners/rss/Makefile.am                         |    1 +
 src/tracker-extract/tracker-read.c                 |    4 +-
 src/tracker-store/tracker-store.c                  |   15 +-
 src/tracker-utils/tracker-search.c                 |   55 +-
 tests/estress/abstract_engine.py                   |    2 +-
 tests/estress/abstract_text_engine.py              |    2 +-
 tests/estress/client.py                            |    2 +-
 tests/estress/mock_engine.py                       |    2 +-
 tests/estress/options.py                           |    2 +-
 tests/estress/rss_engine.py                        |    2 +-
 tests/estress/wh_engine.py                         |    2 +-
 tests/functional-tests/01-insertion.py             |    2 +-
 tests/functional-tests/02-metacontacts.py          |    2 +-
 tests/functional-tests/03-fts-functions.py         |    2 +-
 tests/functional-tests/04-group-concat.py          |    2 +-
 tests/functional-tests/05-coalesce.py              |    2 +-
 tests/functional-tests/06-distance.py              |    2 +-
 tests/functional-tests/07-graph.py                 |    2 +-
 tests/functional-tests/08-unique-insertions.py     |    2 +-
 tests/functional-tests/09-concurrent-query.py      |    2 +-
 tests/functional-tests/10-sqlite-misused.py        |    2 +-
 tests/functional-tests/11-sqlite-batch-misused.py  |    2 +-
 tests/functional-tests/backup-restore-tc.py        |    2 +-
 tests/functional-tests/bootup-tc.py                |    2 +-
 tests/functional-tests/metadata_extraction_tc.py   |    2 +-
 tests/functional-tests/miner-basic-ops.py          |    2 +-
 tests/functional-tests/performance-tc.py           |  122 +-
 tests/functional-tests/virtual-files-tc.py         |    2 +-
 tests/functional-tests/writeback-tc.py             |    2 +-
 tests/libtracker-fts/tracker-parser-test.c         |  107 +-
 tests/libtracker-fts/tracker-parser.c              |    4 +-
 tests/tracker-writeback/01-writeback.py            |    2 +-
 utils/data-generators/barnum/convert_data.py       |    2 +-
 utils/data-generators/barnum/gen_data.py           |    2 +-
 utils/data-generators/barnum/genpw.py              |    2 +-
 utils/data-generators/cc/generate                  |    8 +-
 utils/data-generators/cc/nco.py                    |   54 +
 utils/data-generators/cc/nmm.py                    |    4 +-
 utils/data-generators/cc/nmo.py                    |   26 +-
 utils/data-generators/deprecated/atom2ttl.py       |    2 +-
 utils/data-generators/deprecated/generate_Image.py |    2 +-
 utils/data-generators/deprecated/generate_Video.py |    3 +-
 utils/gtk-sparql/gtk-sparql.py                     |    2 +-
 68 files changed, 2722 insertions(+), 1854 deletions(-)
---