[tracker: 7/7] Merge branch 'sam/resource'

[Sam Thursfield <sthursfield src gnome org>]

commit 5b1084b543ed5ba5907ef67ae5eb126f23ba7c93
Merge: c0913ab 8cc026d
Author: Sam Thursfield <sam afuera me uk>
Date:   Fri Jul 15 00:42:53 2016 +0100

    Merge branch 'sam/resource'

 configure.ac                                       |    2 +-
 docs/manpages/tracker-extract.1                    |    7 +-
 src/libtracker-common/tracker-enums.h              |    5 +
 src/libtracker-extract/Makefile.am                 |    2 +
 src/libtracker-extract/tracker-data.h              |   61 +-
 src/libtracker-extract/tracker-extract-info.c      |  166 +--
 src/libtracker-extract/tracker-extract-info.h      |   16 +-
 src/libtracker-extract/tracker-extract.h           |    1 +
 src/libtracker-extract/tracker-guarantee.c         |  143 +++
 src/libtracker-extract/tracker-guarantee.h         |   10 +
 src/libtracker-extract/tracker-resource-helpers.c  |  303 +++++
 src/libtracker-extract/tracker-resource-helpers.h  |   41 +
 src/libtracker-extract/tracker-xmp.c               |  422 ++-----
 src/libtracker-extract/tracker-xmp.h               |   16 +-
 src/libtracker-sparql-backend/Makefile.am          |    2 +-
 src/libtracker-sparql/Makefile.am                  |    8 +
 src/libtracker-sparql/tracker-namespace-manager.c  |  332 ++++++
 src/libtracker-sparql/tracker-namespace-manager.h  |   49 +
 src/libtracker-sparql/tracker-resource.c           | 1216 ++++++++++++++++++++
 src/libtracker-sparql/tracker-resource.h           |   82 ++
 src/libtracker-sparql/tracker-sparql.h             |    2 +
 src/libtracker-sparql/tracker-uri.c                |   23 +
 src/libtracker-sparql/tracker-uri.h                |   42 +
 src/tracker-extract/tracker-extract-abw.c          |   50 +-
 src/tracker-extract/tracker-extract-bmp.c          |   18 +-
 src/tracker-extract/tracker-extract-decorator.c    |   74 +-
 src/tracker-extract/tracker-extract-dvi.c          |   17 +-
 src/tracker-extract/tracker-extract-epub.c         |  131 +--
 src/tracker-extract/tracker-extract-flac.c         |  254 +----
 src/tracker-extract/tracker-extract-gif.c          |  348 ++-----
 src/tracker-extract/tracker-extract-gstreamer.c    |  911 +++++----------
 src/tracker-extract/tracker-extract-html.c         |   39 +-
 src/tracker-extract/tracker-extract-icon.c         |   19 +-
 src/tracker-extract/tracker-extract-iso.c          |   50 +-
 src/tracker-extract/tracker-extract-jpeg.c         |  372 ++-----
 src/tracker-extract/tracker-extract-libav.c        |  232 +---
 src/tracker-extract/tracker-extract-mp3.c          |  414 +++-----
 src/tracker-extract/tracker-extract-msoffice-xml.c |   57 +-
 src/tracker-extract/tracker-extract-msoffice.c     |   81 +-
 src/tracker-extract/tracker-extract-oasis.c        |   65 +-
 src/tracker-extract/tracker-extract-pdf.c          |  301 ++----
 src/tracker-extract/tracker-extract-playlist.c     |   53 +-
 src/tracker-extract/tracker-extract-png.c          |  348 ++-----
 src/tracker-extract/tracker-extract-ps.c           |   77 +-
 src/tracker-extract/tracker-extract-text.c         |   14 +-
 src/tracker-extract/tracker-extract-tiff.c         |  355 ++-----
 src/tracker-extract/tracker-extract-vorbis.c       |  279 +----
 src/tracker-extract/tracker-extract-xmp.c          |   17 +-
 src/tracker-extract/tracker-extract-xps.c          |   14 +-
 src/tracker-extract/tracker-extract.c              |   93 +-
 src/tracker-extract/tracker-extract.h              |    9 +-
 src/tracker-extract/tracker-main.c                 |   23 +-
 src/tracker/tracker-extract.c                      |   14 +-
 .../libtracker-extract/tracker-extract-info-test.c |   13 +-
 tests/libtracker-extract/tracker-test-xmp.c        |  107 +--
 tests/libtracker-sparql/.gitignore                 |    2 +-
 tests/libtracker-sparql/Makefile.am                |    3 +
 tests/libtracker-sparql/tracker-resource-test.c    |  166 +++
 58 files changed, 3968 insertions(+), 4003 deletions(-)
---