[tracker: 30/30] Merge branch 'wip/passive-extraction'

[Carlos Garnacho <carlosg src gnome org>]

commit 60e8db284e28c53cda61d7a61b2cb215d09dea6c
Merge: ecf27ea 1bde38f
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jan 21 12:58:49 2014 +0100

    Merge branch 'wip/passive-extraction'

 data/dbus/Makefile.am                              |    4 +-
 ....freedesktop.Tracker1.Miner.Extract.service.in} |    2 +-
 data/miners/Makefile.am                            |    3 +
 data/miners/tracker-miner-extract.desktop.in.in    |    6 +
 data/ontologies/33-nfo.ontology                    |    3 +-
 data/ontologies/90-tracker.ontology                |    5 +-
 docs/manpages/tracker-extract.1                    |    3 -
 .../libtracker-miner/libtracker-miner-docs.sgml    |    2 +
 .../libtracker-miner/libtracker-miner-sections.txt |   47 +-
 .../libtracker-miner/libtracker-miner.types        |    1 +
 src/libtracker-extract/tracker-module-manager.c    |   37 +-
 src/libtracker-miner/Makefile.am                   |    8 +-
 src/libtracker-miner/tracker-decorator-fs.c        |  271 ++++
 src/libtracker-miner/tracker-decorator-fs.h        |   66 +
 src/libtracker-miner/tracker-decorator.c           | 1410 ++++++++++++++++++++
 src/libtracker-miner/tracker-decorator.h           |  102 ++
 src/libtracker-miner/tracker-miner.h               |    2 +
 src/miners/fs/tracker-miner-files.c                |  260 +----
 src/tracker-extract/10-abw.rule                    |    2 +-
 src/tracker-extract/10-dvi.rule                    |    2 +-
 src/tracker-extract/10-epub.rule                   |    1 +
 src/tracker-extract/10-flac.rule                   |    2 +-
 src/tracker-extract/10-gif.rule                    |    2 +-
 src/tracker-extract/10-html.rule                   |    2 +-
 src/tracker-extract/10-ico.rule                    |    2 +-
 src/tracker-extract/10-jpeg.rule                   |    2 +-
 src/tracker-extract/10-mp3.rule                    |    2 +-
 src/tracker-extract/10-msoffice.rule               |    2 +-
 src/tracker-extract/10-oasis.rule                  |    2 +-
 src/tracker-extract/10-pdf.rule                    |    2 +-
 src/tracker-extract/10-png.rule                    |    2 +-
 src/tracker-extract/10-ps.rule                     |    2 +-
 src/tracker-extract/10-svg.rule                    |    2 +-
 src/tracker-extract/10-tiff.rule                   |    2 +-
 src/tracker-extract/10-vorbis.rule                 |    2 +-
 src/tracker-extract/10-xps.rule                    |    2 +-
 src/tracker-extract/11-iso.rule                    |    2 +-
 src/tracker-extract/11-msoffice-xml.rule           |    2 +-
 src/tracker-extract/15-gstreamer-guess.rule        |    2 +-
 src/tracker-extract/15-playlist.rule               |    2 +-
 src/tracker-extract/90-gstreamer-generic.rule      |    2 +-
 src/tracker-extract/90-text-generic.rule           |    1 +
 src/tracker-extract/Makefile.am                    |    4 +-
 src/tracker-extract/tracker-controller.c           | 1000 --------------
 src/tracker-extract/tracker-controller.h           |   58 -
 src/tracker-extract/tracker-extract-decorator.c    |  339 +++++
 src/tracker-extract/tracker-extract-decorator.h    |   57 +
 src/tracker-extract/tracker-extract-gif.c          |    1 +
 src/tracker-extract/tracker-extract-gstreamer.c    |   14 +-
 src/tracker-extract/tracker-extract-mp3.c          |    2 +
 src/tracker-extract/tracker-extract-msoffice.c     |    6 +-
 src/tracker-extract/tracker-extract.c              |   41 +-
 src/tracker-extract/tracker-main.c                 |   50 +-
 src/tracker-extract/tracker-read.c                 |   17 +-
 54 files changed, 2467 insertions(+), 1400 deletions(-)
---