ontology: Move nao ontology together with the rest of nepomuk

This ontology offers oddly high-level concepts like nao:Tag, which don't
make much sense to define in the core. Now that we no longer rely on
this ontology for defining other ontologies, we can just move it.

8 files changed, 3 insertions, 15 deletions

diff --git a/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml b/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml
index 12a9c16ce..8bf07aacd 100644
--- a/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml
+++ b/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml
@@ -46,7 +46,6 @@
     <xi:include href="xml/xsd-ontology.xml"/>
     <xi:include href="xml/rdf-ontology.xml"/>
     <xi:include href="xml/nrl-ontology.xml"/>
-    <xi:include href="xml/nao-ontology.xml"/>
   </part>
 
   <xi:include href="ontologies.xml"/>
diff --git a/docs/reference/ontology/ontology-docs.xml b/docs/reference/ontology/ontology-docs.xml
index b560125f7..d79a7f943 100644
--- a/docs/reference/ontology/ontology-docs.xml
+++ b/docs/reference/ontology/ontology-docs.xml
@@ -40,6 +40,7 @@
   <part id="ontology">
     <title>Ontology</title>
     <xi:include href="xml/nie-ontology.xml" />
+    <xi:include href="xml/nao-ontology.xml"/>
     <xi:include href="xml/nfo-ontology.xml" />
     <xi:include href="xml/nco-ontology.xml" />
     <xi:include href="xml/nmo-ontology.xml" />
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index be371602b..60621d397 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -3567,7 +3567,6 @@ get_ontologies (TrackerDataManager  *manager,
 	sorted = g_list_sort (sorted, (GCompareFunc) compare_file_names);
 
 	/* Add our builtin ontologies so they are loaded first */
-	sorted = g_list_prepend (sorted, g_file_new_for_uri ("resource://org/freedesktop/tracker/ontology/31-nao.ontology"));
 	sorted = g_list_prepend (sorted, g_file_new_for_uri ("resource://org/freedesktop/tracker/ontology/20-dc.ontology"));
 	sorted = g_list_prepend (sorted, g_file_new_for_uri ("resource://org/freedesktop/tracker/ontology/12-nrl.ontology"));
 	sorted = g_list_prepend (sorted, g_file_new_for_uri ("resource://org/freedesktop/tracker/ontology/11-rdf.ontology"));
diff --git a/src/ontologies/builtin-ontology.gresource.xml b/src/ontologies/builtin-ontology.gresource.xml
index cd7b13f38..c10cf6fa8 100644
--- a/src/ontologies/builtin-ontology.gresource.xml
+++ b/src/ontologies/builtin-ontology.gresource.xml
@@ -5,6 +5,5 @@
     <file>11-rdf.ontology</file>
     <file>12-nrl.ontology</file>
     <file>20-dc.ontology</file>
-    <file>31-nao.ontology</file>
   </gresource>
 </gresources>
diff --git a/src/ontologies/meson.build b/src/ontologies/meson.build
index d4fe478b0..9a6c55507 100644
--- a/src/ontologies/meson.build
+++ b/src/ontologies/meson.build
@@ -7,13 +7,13 @@ base_ontology = files(
     '12-nrl.ontology',
     '20-dc.description',
     '20-dc.ontology',
-    '31-nao.description',
-    '31-nao.ontology',
 )
 
 nepomuk = files(
     'nepomuk/30-nie.description',
     'nepomuk/30-nie.ontology',
+    'nepomuk/31-nao.description',
+    'nepomuk/31-nao.ontology',
     'nepomuk/32-nco.description',
     'nepomuk/32-nco.ontology',
     'nepomuk/33-nfo.description',
diff --git a/src/ontologies/31-nao.description b/src/ontologies/nepomuk/31-nao.description
index 4a6646da6..4a6646da6 100644
--- a/src/ontologies/31-nao.description
+++ b/src/ontologies/nepomuk/31-nao.description
diff --git a/src/ontologies/31-nao.ontology b/src/ontologies/nepomuk/31-nao.ontology
index 60a237259..60a237259 100644
--- a/src/ontologies/31-nao.ontology
+++ b/src/ontologies/nepomuk/31-nao.ontology
diff --git a/tests/libtracker-data/subqueries/subqueries-minus-5.out b/tests/libtracker-data/subqueries/subqueries-minus-5.out
index 99850a8a5..fb71ba85d 100644
--- a/tests/libtracker-data/subqueries/subqueries-minus-5.out
+++ b/tests/libtracker-data/subqueries/subqueries-minus-5.out
@@ -22,16 +22,6 @@
 "http://purl.org/dc/elements/1.1/subject"
 "http://purl.org/dc/elements/1.1/title"
 "http://purl.org/dc/elements/1.1/type"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#Tag"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#deprecated"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#description"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#hasTag"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#identifier"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#isRelated"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#lastModified"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#numericRating"
-"http://www.semanticdesktop.org/ontologies/2007/08/15/nao#prefLabel"
 "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#"
 "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#InverseFunctionalProperty"
 "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#maxCardinality"