[tracker: 32/32] Merge branch 'wip/extract-graphs'

[Martyn James Russell <mr src gnome org>]

commit 81c9cfd690395f5c742e2285541fe68ea90f185c
Merge: b74b7df 625f6fe
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Sep 6 11:53:27 2011 +0100

    Merge branch 'wip/extract-graphs'

 data/ontologies/31-nao.ontology                    |    3 +-
 .../libtracker-extract-sections.txt                |   19 ++-
 .../libtracker-extract/tracker-extract-mockup.c    |   13 +-
 src/libtracker-extract/Makefile.am                 |    3 +
 src/libtracker-extract/tracker-data.h              |    7 +-
 src/libtracker-extract/tracker-extract-client.c    |  176 ++++++--------
 src/libtracker-extract/tracker-extract-client.h    |   20 +--
 src/libtracker-extract/tracker-extract-info.c      |  256 ++++++++++++++++++++
 src/libtracker-extract/tracker-extract-info.h      |   54 ++++
 src/libtracker-extract/tracker-extract.h           |    1 +
 src/libtracker-extract/tracker-module-manager.c    |    6 +
 src/libtracker-extract/tracker-module-manager.h    |    7 +-
 src/libtracker-extract/tracker-utils.c             |    6 +-
 src/libtracker-extract/tracker-xmp.c               |   30 +++-
 src/libtracker-extract/tracker-xmp.h               |    1 +
 src/libtracker-sparql/tracker-builder.vala         |    4 +-
 src/miners/fs/tracker-miner-files.c                |   24 ++-
 src/tracker-extract/tracker-controller.c           |   35 ++-
 src/tracker-extract/tracker-extract-abw.c          |   14 +-
 src/tracker-extract/tracker-extract-epub.c         |   18 +-
 src/tracker-extract/tracker-extract-flac.c         |   64 +++++-
 src/tracker-extract/tracker-extract-gif.c          |   92 ++++++-
 src/tracker-extract/tracker-extract-gstreamer.c    |  109 +++++++--
 src/tracker-extract/tracker-extract-html.c         |   15 +-
 src/tracker-extract/tracker-extract-icon.c         |   15 +-
 src/tracker-extract/tracker-extract-jpeg.c         |   97 +++++++-
 src/tracker-extract/tracker-extract-libxine.c      |   63 +++--
 src/tracker-extract/tracker-extract-mp3.c          |   60 ++++-
 src/tracker-extract/tracker-extract-mplayer.c      |   28 ++-
 src/tracker-extract/tracker-extract-msoffice-xml.c |   14 +-
 src/tracker-extract/tracker-extract-msoffice.c     |   19 +-
 src/tracker-extract/tracker-extract-oasis.c        |   18 +-
 src/tracker-extract/tracker-extract-pdf.c          |   65 +++++-
 src/tracker-extract/tracker-extract-playlist.c     |   25 ++-
 src/tracker-extract/tracker-extract-png.c          |   96 ++++++--
 src/tracker-extract/tracker-extract-ps.c           |   20 ++-
 src/tracker-extract/tracker-extract-text.c         |   30 +--
 src/tracker-extract/tracker-extract-tiff.c         |   94 +++++++-
 src/tracker-extract/tracker-extract-totem.c        |   22 ++-
 src/tracker-extract/tracker-extract-vorbis.c       |   58 ++++-
 src/tracker-extract/tracker-extract-xmp.c          |   29 ++-
 src/tracker-extract/tracker-extract.c              |   84 ++++---
 src/tracker-extract/tracker-extract.h              |    1 +
 tests/libtracker-extract/tracker-test-xmp.c        |    6 +-
 44 files changed, 1402 insertions(+), 419 deletions(-)
---