[tracker/writeback: 22/23] Merge branch 'master' into writeback

[Philip Van Hoof <pvanhoof src gnome org>]

commit b870b18fdfa8ea66b8c0a238f8ad95e4bc7d4773
Merge: 939026c... 36d7605...
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Nov 6 11:34:11 2009 +0100

    Merge branch 'master' into writeback

 data/.gitignore                                    |    4 +
 data/ontologies/20-dc.ontology                     |    1 -
 data/ontologies/32-nco.ontology                    |   53 +-
 data/ontologies/34-nmo.ontology                    |    5 +-
 src/libtracker-common/tracker-utils.c              |   10 +-
 src/tracker-extract/tracker-extract-mp3.c          |  843 +-
 src/tracker-extract/tracker-extract-msoffice.c     |   18 +-
 src/tracker-extract/tracker-extract-playlist.c     |   55 +-
 src/tracker-extract/tracker-extract-vorbis.c       |  138 +-
 src/tracker-extract/tracker-xmp.c                  |  108 +-
 src/tracker-search-tool/tracker-entry.gs           |   21 +-
 tests/functional-tests/02-metacontacts.py          |  166 +
 tests/functional-tests/03-fts-functions.py         |  133 +
 tests/functional-tests/tests.xml                   |   12 +
 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 ++++++++++++++++++++
 51 files changed, 82426 insertions(+), 584 deletions(-)
---