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

[Martyn James Russell <mr src gnome org>]

commit 581dd0955170339e500cb37d9bb78645031e04c9
Merge: d40e5fe b1f311d
Author: Martyn Russell <martyn lanedo com>
Date:   Tue May 11 12:41:59 2010 +0100

    Merge branch 'master' into harmattan

 NEWS                                               |  107 +++
 configure.ac                                       |   44 +-
 data/ontologies/32-nco.ontology                    |   11 +-
 data/ontologies/33-nfo.ontology                    |    9 +-
 data/ontologies/Indices.list                       |    2 +
 docs/manpages/tracker-control.1                    |    6 +
 docs/manpages/tracker-info.1                       |   10 +-
 docs/manpages/tracker-search.1                     |   21 +-
 docs/manpages/tracker-status.1                     |   23 +-
 .../tmpl/tracker-sparql-builder.sgml               |    6 +
 po/POTFILES.in                                     |    1 +
 po/cs.po                                           |   18 +-
 po/de.po                                           |  162 ++--
 src/libtracker-client/tracker.c                    |   10 +-
 src/libtracker-common/tracker-date-time.c          |    2 +-
 src/libtracker-common/tracker-keyfile-object.c     |   18 +-
 src/libtracker-common/tracker-log.c                |    3 -
 src/libtracker-data/tracker-data-manager.c         |    5 +-
 src/libtracker-data/tracker-ontologies.c           |    3 +-
 src/libtracker-db/tracker-db-interface-sqlite.c    |   65 +-
 src/libtracker-db/tracker-db-journal.c             |    1 +
 src/libtracker-db/tracker-db-manager.c             |   27 +-
 src/libtracker-extract/tracker-iptc.c              |    5 +
 src/libtracker-extract/tracker-utils.c             |    4 +
 src/libtracker-extract/tracker-xmp.c               |   34 +-
 src/libtracker-fts/tracker-fts.c                   |   22 +-
 src/libtracker-fts/tracker-fts.h                   |    5 +-
 src/libtracker-fts/tracker-parser.c                |    2 +
 src/libtracker-miner/.gitignore                    |    1 +
 src/libtracker-miner/Makefile.am                   |    9 +-
 src/libtracker-miner/tracker-miner-fs.c            |   13 +-
 src/libtracker-miner/tracker-miner-manager.c       |    3 -
 src/libtracker-miner/tracker-miner-object.c        |   13 -
 src/libtracker-miner/tracker-miner.deps            |    1 +
 src/libtracker-miner/tracker-miner.vapi            |   30 +-
 src/miners/fs/tracker-config.c                     |  125 +++-
 src/miners/fs/tracker-config.h                     |    2 +
 src/miners/fs/tracker-main.c                       |    1 +
 src/miners/fs/tracker-miner-files.c                |    5 -
 src/tracker-extract/Makefile.am                    |    8 +-
 src/tracker-extract/tracker-extract-html.c         |    2 +-
 src/tracker-extract/tracker-extract-jpeg.c         |    4 +-
 src/tracker-extract/tracker-extract-mp3.c          |    2 +-
 src/tracker-extract/tracker-extract-msoffice.c     |    6 +-
 src/tracker-extract/tracker-extract-pdf.c          |  593 --------------
 src/tracker-extract/tracker-extract-pdf.cpp        |  805 ++++++++++++++++++++
 src/tracker-extract/tracker-extract-png.c          |    4 +-
 src/tracker-extract/tracker-extract-tiff.c         |    4 +-
 src/tracker-extract/tracker-main.c                 |    2 +
 src/tracker-preferences/tracker-config.vapi        |    2 +
 src/tracker-preferences/tracker-preferences.vala   |    4 +-
 src/tracker-search-tool/tracker-category-view.gs   |    9 +-
 src/tracker-search-tool/tracker-entry.gs           |    2 +-
 src/tracker-search-tool/tracker-metadata-tile.gs   |   63 +-
 src/tracker-search-tool/tracker-query.gs           |    3 +-
 src/tracker-search-tool/tracker-result-grid.gs     |    2 +-
 src/tracker-search-tool/tracker-search-tool.gs     |    2 +-
 src/tracker-search-tool/tracker-utils.gs           |    4 +-
 src/tracker-store/tracker-main.c                   |    1 +
 src/tracker-store/tracker-resources.c              |   27 +-
 src/tracker-store/tracker-store.c                  |    9 +-
 src/tracker-utils/tracker-info.c                   |  129 +++-
 src/tracker-utils/tracker-search.c                 |  339 ++++++++-
 src/tracker-utils/tracker-status.c                 |    1 +
 src/tracker-utils/tracker-tag.c                    |    9 +-
 src/tracker-writeback/tracker-config.c             |    4 -
 src/tracker-writeback/tracker-writeback-xmp.c      |    6 +-
 tests/functional-tests/.gitignore                  |    1 +
 tests/functional-tests/10-sqlite-misused.py        |   95 +++
 tests/functional-tests/11-sqlite-batch-misused.py  |  113 +++
 tests/functional-tests/Makefile.am                 |    1 +
 tests/functional-tests/backup-restore-tc.py        |  558 ++++++++++++++
 .../functional-tests/force-sqlite-misused-batch.sh |    9 +
 tests/functional-tests/force-sqlite-misused.sh     |    9 +
 tests/functional-tests/helper-test-data.sh         |   44 ++
 tests/functional-tests/tests.xml                   |   78 ++-
 tests/libtracker-client/.gitignore                 |    1 +
 tests/libtracker-common/tracker-dbus-test.c        |    2 +
 tests/libtracker-common/tracker-type-utils-test.c  |    3 +
 tests/libtracker-db/tracker-db-dbus-test.c         |    1 +
 tests/libtracker-extract/tracker-utils-test.c      |    1 +
 tests/libtracker-extract/tracker-xmp-test.c        |   10 +-
 utils/data-generators/cc/generate                  |    9 +-
 utils/data-generators/cc/ttl/.gitignore            |    1 +
 utils/data-generators/generate-data-for-music.py   |   12 +-
 85 files changed, 2774 insertions(+), 1049 deletions(-)
---