[tracker: 2/2] Merge branch 'sam/ontology-urls' into 'master'

[Sam Thursfield <sthursfield src gnome org>]

commit c3916ecd9496637ef63270c2e1d7bc15a0ea63aa
Merge: 41371ded3 3d541fb56
Author: Sam Thursfield <sam afuera me uk>
Date:   Thu Apr 23 21:50:20 2020 +0000

    Merge branch 'sam/ontology-urls' into 'master'
    
    Update ontology URLs for 3.0
    
    Closes #104 and #162
    
    See merge request GNOME/tracker!222

 docs/manpages/tracker-info.1.txt                   |  2 +-
 docs/manpages/tracker-sparql.1.txt                 | 26 ++++++++--------
 .../examples/ontologies/defining-namespaces-1.txt  |  4 +--
 .../examples/ontologies/example.description        |  2 +-
 docs/tools/ttl_loader.c                            |  8 ++---
 docs/tools/ttlresource2xml.c                       |  2 +-
 examples/rss-reader/initial-data.ttl               | 18 +++++------
 src/libtracker-data/tracker-sparql.c               |  4 +--
 src/libtracker-sparql/tracker-ontologies.h         | 26 ++++++++--------
 src/ontologies/10-xsd.description                  |  2 +-
 src/ontologies/10-xsd.ontology                     |  2 +-
 src/ontologies/11-rdf.description                  |  2 +-
 src/ontologies/11-rdf.ontology                     |  4 +--
 src/ontologies/12-nrl.description                  |  4 +--
 src/ontologies/12-nrl.ontology                     |  4 +--
 src/ontologies/20-dc.description                   |  2 +-
 src/ontologies/20-dc.ontology                      |  4 +--
 src/ontologies/nepomuk/30-nie.description          |  4 +--
 src/ontologies/nepomuk/30-nie.ontology             |  6 ++--
 src/ontologies/nepomuk/31-nao.description          |  4 +--
 src/ontologies/nepomuk/31-nao.ontology             |  6 ++--
 src/ontologies/nepomuk/32-nco.description          |  4 +--
 src/ontologies/nepomuk/32-nco.ontology             | 10 +++---
 src/ontologies/nepomuk/33-nfo.description          |  4 +--
 src/ontologies/nepomuk/33-nfo.ontology             | 10 +++---
 src/ontologies/nepomuk/34-nmo.description          |  4 +--
 src/ontologies/nepomuk/34-nmo.ontology             | 12 ++++----
 src/ontologies/nepomuk/35-ncal.description         |  4 +--
 src/ontologies/nepomuk/35-ncal.ontology            | 12 ++++----
 src/ontologies/nepomuk/36-scal.description         |  4 +--
 src/ontologies/nepomuk/36-scal.ontology            | 10 +++---
 src/ontologies/nepomuk/37-nid3.description         |  4 +--
 src/ontologies/nepomuk/37-nid3.ontology            | 12 ++++----
 src/ontologies/nepomuk/38-nmm.description          |  4 +--
 src/ontologies/nepomuk/38-nmm.ontology             | 12 ++++----
 src/ontologies/nepomuk/39-mto.description          |  4 +--
 src/ontologies/nepomuk/39-mto.ontology             | 10 +++---
 src/ontologies/nepomuk/40-mlo.description          |  4 +--
 src/ontologies/nepomuk/40-mlo.ontology             | 10 +++---
 src/ontologies/nepomuk/41-mfo.description          |  4 +--
 src/ontologies/nepomuk/41-mfo.ontology             | 12 ++++----
 src/ontologies/nepomuk/89-mtp.description          |  4 +--
 src/ontologies/nepomuk/89-mtp.ontology             | 12 ++++----
 src/ontologies/nepomuk/90-tracker.description      |  4 +--
 src/ontologies/nepomuk/90-tracker.ontology         | 10 +++---
 src/ontologies/nepomuk/92-slo.description          |  4 +--
 src/ontologies/nepomuk/92-slo.ontology             | 10 +++---
 src/ontologies/nepomuk/93-libosinfo.description    |  4 +--
 src/ontologies/nepomuk/93-libosinfo.ontology       | 10 +++---
 src/tracker/tracker-export.c                       |  2 +-
 src/tracker/tracker-info.c                         |  4 +--
 tests/functional-tests/group-concat.py             |  6 ++--
 tests/functional-tests/test-data/test-movie.ttl    |  4 +--
 .../test-ontologies/add-class/91-test.ontology     |  4 +--
 .../add-domainIndex/91-test.ontology               |  4 +--
 .../test-ontologies/add-prop/91-test.ontology      |  4 +--
 .../test-ontologies/basic-future/91-test.ontology  |  4 +--
 .../test-ontologies/basic/91-test.ontology         |  4 +--
 .../test-ontologies/cardinality/91-test.ontology   |  4 +--
 .../test-ontologies/indexed/91-test.ontology       |  4 +--
 .../test-ontologies/notify/91-test.ontology        |  4 +--
 .../property-promotion/91-test.ontology            |  4 +--
 .../property-range-int-to-string/91-test.ontology  |  4 +--
 .../property-range-string-to-date/91-test.ontology |  4 +--
 .../superclass-remove/91-test.ontology             |  4 +--
 tests/libtracker-data/aggregates/test.ontology     |  2 +-
 tests/libtracker-data/algebra/test-1.ontology      |  2 +-
 tests/libtracker-data/algebra/test-2.ontology      |  2 +-
 tests/libtracker-data/anon/test.ontology           |  2 +-
 tests/libtracker-data/ask/data.ontology            |  2 +-
 tests/libtracker-data/basic/test.ontology          |  2 +-
 tests/libtracker-data/bind/data.ontology           |  2 +-
 .../bnode-coreference/data.ontology                |  2 +-
 tests/libtracker-data/bnode/data.ontology          |  2 +-
 tests/libtracker-data/bound/data.ontology          |  2 +-
 tests/libtracker-data/change/change-test-4.rq      |  2 +-
 tests/libtracker-data/change/change-test-5.rq      |  2 +-
 .../change/source/99-example.ontology.v1           |  2 +-
 .../change/source/99-example.ontology.v10          |  4 +--
 .../change/source/99-example.ontology.v11          |  4 +--
 .../change/source/99-example.ontology.v2           |  2 +-
 .../change/source/99-example.ontology.v3           |  4 +--
 .../change/source/99-example.ontology.v4           |  4 +--
 .../change/source/99-example.ontology.v5           |  4 +--
 .../change/source/99-example.ontology.v6           |  4 +--
 .../change/source/99-example.ontology.v7           |  4 +--
 .../change/source/99-example.ontology.v8           |  4 +--
 .../change/source/99-example.ontology.v9           |  4 +--
 tests/libtracker-data/construct/test.ontology      |  2 +-
 tests/libtracker-data/datetime/test.ontology       |  2 +-
 tests/libtracker-data/describe/test.ontology       |  2 +-
 tests/libtracker-data/error/test.ontology          |  2 +-
 tests/libtracker-data/expr-ops/data.ontology       |  2 +-
 tests/libtracker-data/functions/test-1.ontology    |  2 +-
 tests/libtracker-data/functions/test-2.ontology    |  2 +-
 tests/libtracker-data/graph/test.ontology          |  2 +-
 tests/libtracker-data/langstring/test.ontology     |  2 +-
 tests/libtracker-data/lists/test.ontology          |  2 +-
 .../mixed-cardinality/test.ontology                |  4 +--
 tests/libtracker-data/nie/data-1.ttl               | 16 +++++-----
 tests/libtracker-data/nmo/data-1.ttl               | 16 +++++-----
 tests/libtracker-data/optional/test-1.ontology     |  2 +-
 tests/libtracker-data/optional/test-2.ontology     |  4 +--
 tests/libtracker-data/property-paths/test.ontology |  2 +-
 tests/libtracker-data/regex/test.ontology          |  2 +-
 tests/libtracker-data/sort/test.ontology           |  4 +--
 .../subqueries/subqueries-minus-5.out              | 36 +++++++++++-----------
 tests/libtracker-data/subqueries/test.ontology     |  4 +--
 tests/libtracker-data/turtle/test.ontology         |  2 +-
 tests/libtracker-data/update/test.ontology         |  4 +--
 tests/libtracker-fts/data.ontology                 |  6 ++--
 tests/libtracker-sparql/tracker-statement-test.c   |  6 ++--
 utils/ontology/README.example                      |  2 +-
 utils/ontology/ontology-validator.c                |  8 ++---
 utils/ontology/rdfxml2metadatasample.xsl           | 16 +++++-----
 utils/ontology/rdfxml2servicesample.xsl            | 16 +++++-----
 utils/ontology/rdfxml2unittest_data.xsl            | 32 +++++++++----------
 utils/ontology/rdfxml2unittest_query.xsl           | 32 +++++++++----------
 utils/ontology/rdfxmlsample.xsl                    | 16 +++++-----
 utils/ontology/service2rdf-xml.py                  | 16 +++++-----
 120 files changed, 369 insertions(+), 369 deletions(-)
---