[tracker: 6/6] Merge branch 'wip/carlosg/shuffle-nao' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit a36be67211a30fea42e2f596a32fa31df0dc8b31
Merge: d423b674a b92c3d139
Author: Sam Thursfield <sam afuera me uk>
Date:   Sun Apr 12 14:16:17 2020 +0000

    Merge branch 'wip/carlosg/shuffle-nao' into 'master'
    
    Shuffle NAO ontology into nepomuk
    
    See merge request GNOME/tracker!214

 .../examples/ontologies/defining-namespaces-1.txt  |   3 +-
 .../libtracker-sparql/libtracker-sparql-docs.xml   |   1 -
 docs/reference/ontology/ontology-docs.xml          |   1 +
 docs/tools/ttl_loader.c                            |   7 +-
 src/libtracker-data/tracker-data-manager.c         |  27 +++---
 src/libtracker-fts/tracker-fts.c                   |   9 +-
 src/ontologies/10-xsd.ontology                     |   3 +-
 src/ontologies/11-rdf.ontology                     |  17 +++-
 src/ontologies/12-nrl.ontology                     |   3 +-
 src/ontologies/20-dc.ontology                      |   3 +-
 src/ontologies/builtin-ontology.gresource.xml      |   1 -
 src/ontologies/meson.build                         |   4 +-
 src/ontologies/nepomuk/30-nie.ontology             |   6 +-
 src/ontologies/{ => nepomuk}/31-nao.description    |   0
 src/ontologies/{ => nepomuk}/31-nao.ontology       |   2 +-
 src/ontologies/nepomuk/32-nco.ontology             |   3 +-
 src/ontologies/nepomuk/33-nfo.ontology             |   4 +-
 src/ontologies/nepomuk/34-nmo.ontology             |   4 +-
 src/ontologies/nepomuk/35-ncal.ontology            |   3 +-
 src/ontologies/nepomuk/36-scal.ontology            |   3 +-
 src/ontologies/nepomuk/37-nid3.ontology            |   3 +-
 src/ontologies/nepomuk/38-nmm.ontology             |   6 +-
 src/ontologies/nepomuk/39-mto.ontology             |   3 +-
 src/ontologies/nepomuk/40-mlo.ontology             | 103 ++++++++++-----------
 src/ontologies/nepomuk/41-mfo.ontology             |   3 +-
 src/ontologies/nepomuk/89-mtp.ontology             |   3 +-
 src/ontologies/nepomuk/90-tracker.ontology         |   2 +-
 src/ontologies/nepomuk/92-slo.ontology             |   5 +-
 src/ontologies/nepomuk/93-libosinfo.ontology       |   3 +-
 tests/functional-tests/ontology-changes.py         |   6 +-
 .../test-ontologies/add-class/91-test.ontology     |   3 +-
 .../add-domainIndex/91-test.ontology               |   3 +-
 .../test-ontologies/add-prop/91-test.ontology      |   3 +-
 .../test-ontologies/basic-future/91-test.ontology  |   3 +-
 .../test-ontologies/basic/91-test.ontology         |   3 +-
 .../test-ontologies/cardinality/91-test.ontology   |   3 +-
 .../test-ontologies/indexed/91-test.ontology       |   3 +-
 .../test-ontologies/notify/91-test.ontology        |   3 +-
 .../property-promotion/91-test.ontology            |   3 +-
 .../property-range-int-to-string/91-test.ontology  |   3 +-
 .../property-range-string-to-date/91-test.ontology |   3 +-
 .../superclass-remove/91-test.ontology             |   3 +-
 .../change/source/99-example.ontology.v1           |   3 +-
 .../change/source/99-example.ontology.v10          |   3 +-
 .../change/source/99-example.ontology.v11          |   3 +-
 .../change/source/99-example.ontology.v2           |   3 +-
 .../change/source/99-example.ontology.v3           |   3 +-
 .../change/source/99-example.ontology.v4           |   3 +-
 .../change/source/99-example.ontology.v5           |   3 +-
 .../change/source/99-example.ontology.v6           |   3 +-
 .../change/source/99-example.ontology.v7           |   3 +-
 .../change/source/99-example.ontology.v8           |   3 +-
 .../change/source/99-example.ontology.v9           |   3 +-
 .../subqueries/subqueries-minus-5.out              |  12 +--
 tests/libtracker-fts/data.ontology                 |   3 +-
 55 files changed, 141 insertions(+), 184 deletions(-)
---