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

[Martyn James Russell <mr src gnome org>]

commit 8580ce30eca3d20affa91621e873299a5efe0ec3
Merge: 05dc9ef 2520242
Author: Martyn Russell <martyn lanedo com>
Date:   Fri Nov 6 16:20:21 2009 +0000

    Merge branch 'master' into harmattan

 NEWS                                               |   87 +
 configure.ac                                       |   87 +-
 data/.gitignore                                    |    5 +-
 data/ontologies/20-dc.ontology                     |   19 +-
 data/ontologies/30-nie.ontology                    |   38 +-
 data/ontologies/31-nao.ontology                    |    4 +-
 data/ontologies/32-nco.ontology                    |  166 +-
 data/ontologies/33-nfo.ontology                    |   20 +-
 data/ontologies/34-nmo.ontology                    |   26 +-
 data/ontologies/35-ncal.ontology                   |   16 +-
 data/ontologies/37-nid3.ontology                   |   21 +-
 data/ontologies/38-nmm.ontology                    |   47 +-
 data/ontologies/89-mtp.ontology                    |    7 +-
 .../libtracker-miner/tmpl/tracker-miner.sgml       |   19 +-
 po/es.po                                           |  965 +-
 po/pl.po                                           | 2463 +-
 src/libtracker-common/tracker-sparql-builder.vala  |    4 +
 src/libtracker-common/tracker-utils.c              |   24 +-
 src/libtracker-data/tracker-data-manager.c         |   17 +-
 src/libtracker-data/tracker-data-update.c          |   76 +-
 src/libtracker-data/tracker-sparql-query.vala      |   16 +-
 src/libtracker-db/tracker-db-manager.c             |    5 +
 src/libtracker-fts/tracker-parser.c                |    2 +-
 src/libtracker-miner/tracker-miner-fs.c            |  271 +-
 src/libtracker-miner/tracker-miner.c               |  374 +-
 src/libtracker-miner/tracker-miner.h               |   41 +-
 src/tracker-control/.gitignore                     |    1 +
 src/tracker-explorer/.gitignore                    |    2 +-
 src/tracker-extract/Makefile.am                    |   14 +-
 src/tracker-extract/tracker-albumart-dummy.c       |   40 +
 src/tracker-extract/tracker-albumart-generic.h     |   40 +
 src/tracker-extract/tracker-albumart-pixbuf.c      |  111 +
 src/tracker-extract/tracker-albumart-quill.cpp     |   97 +
 src/tracker-extract/tracker-albumart.c             |  105 +-
 src/tracker-extract/tracker-extract-abw.c          |   45 +-
 .../tracker-extract-gstreamer-helix.c              |   32 +-
 src/tracker-extract/tracker-extract-gstreamer.c    |  274 +-
 src/tracker-extract/tracker-extract-html.c         |  245 +-
 src/tracker-extract/tracker-extract-imagemagick.c  |   32 +-
 src/tracker-extract/tracker-extract-jpeg.c         |  524 +-
 src/tracker-extract/tracker-extract-libxine.c      |  145 +-
 src/tracker-extract/tracker-extract-mockup.c       |   59 +-
 src/tracker-extract/tracker-extract-mp3.c          |  853 +-
 src/tracker-extract/tracker-extract-mplayer.c      |  111 +-
 src/tracker-extract/tracker-extract-msoffice.c     |  159 +-
 src/tracker-extract/tracker-extract-oasis.c        |   64 +-
 src/tracker-extract/tracker-extract-pdf.c          |  431 +-
 src/tracker-extract/tracker-extract-playlist.c     |   55 +-
 src/tracker-extract/tracker-extract-png.c          |  135 +-
 src/tracker-extract/tracker-extract-ps.c           |  197 +-
 src/tracker-extract/tracker-extract-tiff.c         |  127 +-
 src/tracker-extract/tracker-extract-totem.c        |  123 +-
 src/tracker-extract/tracker-extract-vorbis.c       |  138 +-
 src/tracker-extract/tracker-extract-xmp.c          |    2 -
 src/tracker-extract/tracker-xmp.c                  |  108 +-
 src/tracker-miner-fs/tracker-miner-files.c         |  101 +-
 src/tracker-search-bar/tracker-applet.c            |  268 +-
 src/tracker-search-bar/tracker-applet.h            |    8 +
 src/tracker-search-bar/tracker-results-window.c    |  434 +-
 src/tracker-search-tool/tracker-entry.gs           |   21 +-
 src/tracker-status-icon/tracker-status-icon.c      |   81 +-
 src/tracker-store/Makefile.am                      |    1 -
 src/tracker-store/tracker-backup.h                 |   33 +-
 src/tracker-store/tracker-config.h                 |    2 +-
 src/tracker-store/tracker-dbus.c                   |    1 -
 src/tracker-store/tracker-dbus.h                   |    8 +-
 src/tracker-store/tracker-events.h                 |   21 +-
 src/tracker-store/tracker-main.c                   |  249 +-
 src/tracker-store/tracker-main.h                   |   39 -
 src/tracker-store/tracker-push-registrar.h         |    7 +-
 src/tracker-store/tracker-push.c                   |    2 +
 src/tracker-store/tracker-push.h                   |   15 +-
 src/tracker-store/tracker-resource-class.h         |    6 +-
 src/tracker-store/tracker-resources.h              |   67 +-
 src/tracker-store/tracker-statistics.c             |    1 -
 src/tracker-store/tracker-statistics.h             |   14 +-
 src/tracker-store/tracker-store.h                  |   20 +-
 tests/functional-tests/02-metacontacts.py          |  166 +
 tests/functional-tests/03-fts-functions.py         |  133 +
 tests/functional-tests/Makefile.am                 |    4 +-
 tests/functional-tests/tests.xml                   |   14 +-
 utils/data-generators/README.tracker               |   82 +
 utils/data-generators/all_generate_and_import.sh   |    7 +
 utils/data-generators/atom2ttl.py                  |   77 +
 utils/data-generators/barnum/LICENSE               |  278 +
 utils/data-generators/barnum/README                |  171 +
 utils/data-generators/barnum/convert_data.py       |  100 +
 utils/data-generators/barnum/gen_data.py           |  188 +
 utils/data-generators/barnum/gen_vcard.py          |   34 +
 utils/data-generators/barnum/gencc.py              |  177 +
 utils/data-generators/barnum/genpw.py              |   59 +
 .../barnum/source-data/area-codes.txt              |   52 +
 .../barnum/source-data/company-names.txt           |   63 +
 .../barnum/source-data/company-types.txt           |   11 +
 .../barnum/source-data/email-domains.txt           |    9 +
 .../barnum/source-data/female-first-name.txt       | 1501 +
 .../barnum/source-data/female-prefix.txt           |    3 +
 .../barnum/source-data/job-titles.txt              | 4225 ++
 .../barnum/source-data/last-name.txt               | 5001 ++
 .../barnum/source-data/latin-words.txt             |  132 +
 .../barnum/source-data/male-first-name.txt         | 1219 +
 .../barnum/source-data/male-prefix.txt             |    2 +
 .../barnum/source-data/street-names.txt            | 1048 +
 .../barnum/source-data/street-types.txt            |    9 +
 .../barnum/source-data/zip-codes.txt               | 5575 ++
 utils/data-generators/bookmarks.in                 |   11 +
 utils/data-generators/gen_bookmarks.py             |   30 +
 utils/data-generators/gen_contacts_messages.py     |  283 +
 utils/data-generators/gen_gossip.py                |  250 +
 utils/data-generators/gen_music.py                 |  161 +
 utils/data-generators/gen_webhistory.py            |   48 +
 utils/data-generators/generate_all.sh              |   22 +
 utils/data-generators/get-fresh-planets.sh         |    3 +
 utils/data-generators/id32nmmTurtle.py             |  172 +
 utils/data-generators/id32ttl.py                   |  150 +
 utils/data-generators/internals/id3reader.py       |    1 +
 utils/data-generators/internals/tools.py           |   82 +
 utils/data-generators/songlist.ttl                 |60207 ++++++++++++++++++++
 118 files changed, 87945 insertions(+), 4303 deletions(-)
---