GNOME.org
 

[tracker/data-in-binary-dirs: 3/8] data: Moved ontologies/ into src/

commit 351980b0d41ac406d60d96bb6e2811168c39bdc9
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Sep 4 19:30:08 2014 +0100

    data: Moved ontologies/ into src/

 configure.ac                                       |    2 +-
 data/Makefile.am                                   |    2 +-
 docs/reference/ontology/Makefile.am                |    4 ++--
 docs/tools/gen-doc.sh                              |    2 +-
 docs/tools/generate-ontology.sh                    |    2 +-
 src/Makefile.am                                    |    1 +
 {data => src}/ontologies/10-xsd.description        |    2 +-
 {data => src}/ontologies/10-xsd.ontology           |    0
 {data => src}/ontologies/11-rdf.description        |    2 +-
 {data => src}/ontologies/11-rdf.ontology           |    0
 {data => src}/ontologies/12-nrl.description        |    2 +-
 {data => src}/ontologies/12-nrl.ontology           |    0
 {data => src}/ontologies/20-dc.description         |    2 +-
 {data => src}/ontologies/20-dc.ontology            |    0
 {data => src}/ontologies/30-nie.description        |    2 +-
 {data => src}/ontologies/30-nie.ontology           |    0
 {data => src}/ontologies/31-nao.description        |    2 +-
 {data => src}/ontologies/31-nao.ontology           |    0
 {data => src}/ontologies/32-nco.description        |    2 +-
 {data => src}/ontologies/32-nco.ontology           |    0
 {data => src}/ontologies/33-nfo.description        |    2 +-
 {data => src}/ontologies/33-nfo.ontology           |    0
 {data => src}/ontologies/34-nmo.description        |    0
 {data => src}/ontologies/34-nmo.ontology           |    0
 {data => src}/ontologies/35-ncal.description       |    2 +-
 {data => src}/ontologies/35-ncal.ontology          |    0
 {data => src}/ontologies/36-scal.description       |    2 +-
 {data => src}/ontologies/36-scal.ontology          |    0
 {data => src}/ontologies/37-nid3.description       |    2 +-
 {data => src}/ontologies/37-nid3.ontology          |    0
 {data => src}/ontologies/38-nmm.description        |    2 +-
 {data => src}/ontologies/38-nmm.ontology           |    0
 {data => src}/ontologies/39-mto.description        |    2 +-
 {data => src}/ontologies/39-mto.ontology           |    0
 {data => src}/ontologies/40-mlo.description        |    2 +-
 {data => src}/ontologies/40-mlo.ontology           |    0
 {data => src}/ontologies/41-mfo.description        |    2 +-
 {data => src}/ontologies/41-mfo.ontology           |    0
 {data => src}/ontologies/89-mtp.description        |    2 +-
 {data => src}/ontologies/89-mtp.ontology           |    0
 {data => src}/ontologies/90-tracker.description    |    2 +-
 {data => src}/ontologies/90-tracker.ontology       |    0
 {data => src}/ontologies/91-maemo.description      |    2 +-
 {data => src}/ontologies/91-maemo.ontology         |    0
 {data => src}/ontologies/92-slo.description        |    2 +-
 {data => src}/ontologies/92-slo.ontology           |    0
 {data => src}/ontologies/93-libosinfo.description  |    2 +-
 {data => src}/ontologies/93-libosinfo.ontology     |    0
 {data => src}/ontologies/Indices.list              |    0
 {data => src}/ontologies/Makefile.am               |    7 +++----
 tests/libtracker-data/tracker-backup-test.c        |    2 +-
 .../libtracker-data/tracker-ontology-change-test.c |    2 +-
 tests/libtracker-data/tracker-ontology-test.c      |    2 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    2 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-fts/tracker-fts-test.c            |    2 +-
 utils/ontology/README.example                      |    4 ++--
 57 files changed, 38 insertions(+), 38 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 85802be..efaebe8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2568,7 +2568,6 @@ AC_CONFIG_FILES([
        data/languages/Makefile
        data/Makefile
        data/miners/Makefile
-       data/ontologies/Makefile
        docs/Makefile
        docs/design/Makefile
        docs/manpages/Makefile
@@ -2604,6 +2603,7 @@ AC_CONFIG_FILES([
        src/miners/apps/Makefile
        src/miners/rss/Makefile
        src/miners/user-guides/Makefile
+       src/ontologies/Makefile
        src/tracker-store/Makefile
        src/tracker-control/Makefile
        src/tracker-extract/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 47db515..c0caf5e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = dbus languages icons ontologies miners gschemas
+SUBDIRS = dbus languages icons miners gschemas
diff --git a/docs/reference/ontology/Makefile.am b/docs/reference/ontology/Makefile.am
index 490373a..3a818e8 100644
--- a/docs/reference/ontology/Makefile.am
+++ b/docs/reference/ontology/Makefile.am
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = 1.6
 
 # Generation of ontology.png using ontology-graph
 ontology.png:
-       $(top_builddir)/docs/tools/ontology-graph -d $(top_srcdir)/data/ontologies -o ontology.dot
+       $(top_builddir)/docs/tools/ontology-graph -d $(top_srcdir)/src/ontologies -o ontology.dot
        $(AM_V_GEN) $(GRAPHVIZ_FDP) -Tpng -o $@ ontology.dot
        rm ontology.dot
 
@@ -64,7 +64,7 @@ ONTOLOGY_INFOS_XML =                                   \
 
 # Generation of the ontology XML files.
 gen-doc.stamp: $(ONTOLOGY_EXPLANATIONS)
-       $(top_srcdir)/docs/tools/gen-doc.sh $(top_builddir)/docs/tools/ttl2sgml $(top_srcdir)/data/ontologies 
$(top_srcdir)/docs/ontologies .
+       $(top_srcdir)/docs/tools/gen-doc.sh $(top_builddir)/docs/tools/ttl2sgml $(top_srcdir)/src/ontologies 
$(top_srcdir)/docs/ontologies .
        $(AM_V_GEN) touch $@
 
 # Make the final XML files depend on the stamp
diff --git a/docs/tools/gen-doc.sh b/docs/tools/gen-doc.sh
index 0229116..3893a37 100755
--- a/docs/tools/gen-doc.sh
+++ b/docs/tools/gen-doc.sh
@@ -50,7 +50,7 @@ echo "<?xml version='1.0' encoding='UTF-8'?>
 <tbody>" > $BUILD_DIR/fts-properties.xml
 
 for f in `find $ONTOLOGIES_DATA_DIR -name "*.description"` ; do
-    # ../../data/ontologies/XX-aaa.description -> PREFIX=aaa
+    # ../../src/ontologies/XX-aaa.description -> PREFIX=aaa
     TMPNAME=${f%.description}
     PREFIX=${TMPNAME#*-}
     echo "- Generating $PREFIX documentation"
diff --git a/docs/tools/generate-ontology.sh b/docs/tools/generate-ontology.sh
index 98c6f58..5068dd9 100755
--- a/docs/tools/generate-ontology.sh
+++ b/docs/tools/generate-ontology.sh
@@ -18,6 +18,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA. 
 
-./ontology-graph -d ../../data/ontologies -o ontology.dot
+./ontology-graph -d ../../src/ontologies -o ontology.dot
 fdp -Tpng -o ontology.png ontology.dot
 rm ontology.dot
diff --git a/src/Makefile.am b/src/Makefile.am
index ee76d8c..dcf8dd6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,6 +3,7 @@ libtrackerfts_dir = libtracker-fts
 endif
 
 SUBDIRS =                                              \
+       ontologies                                     \
        gvdb                                           \
        $(libstemmer_dir)                              \
        libtracker-common                              \
diff --git a/data/ontologies/10-xsd.description b/src/ontologies/10-xsd.description
similarity index 93%
rename from data/ontologies/10-xsd.description
rename to src/ontologies/10-xsd.description
index 9f4c1b3..18ede47 100644
--- a/data/ontologies/10-xsd.description
+++ b/src/ontologies/10-xsd.description
@@ -8,7 +8,7 @@
        dsc:editor "David C. Fallside, IBM &lt;fallside us ibm com&gt;";
        dsc:editor "Priscilla Walmsley &lt;pwalmsley datypic com&gt; - Second Edition";
        dsc:editor "Tracker developers (translation into turtle)" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/10-xsd.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/10-xsd.ontology";;
 
        dsc:localPrefix "xsd" ;
        dsc:baseUrl "http://www.w3.org/2001/XMLSchema#"; ;
diff --git a/data/ontologies/10-xsd.ontology b/src/ontologies/10-xsd.ontology
similarity index 100%
rename from data/ontologies/10-xsd.ontology
rename to src/ontologies/10-xsd.ontology
diff --git a/data/ontologies/11-rdf.description b/src/ontologies/11-rdf.description
similarity index 84%
rename from data/ontologies/11-rdf.description
rename to src/ontologies/11-rdf.description
index c17f597..2643af2 100644
--- a/data/ontologies/11-rdf.description
+++ b/src/ontologies/11-rdf.description
@@ -5,7 +5,7 @@
        dsc:description "Core RDF classes to keep the internal consistency of the ontology" ;
        dsc:author "W3C" ;
        dsc:editor "Tracker developers (translation into turtle)" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/11-rdf.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/11-rdf.ontology";;
 
        dsc:localPrefix "rdf" ;
        dsc:baseUrl "http://www.w3.org/2000/01/rdf-schema#"; ;
diff --git a/data/ontologies/11-rdf.ontology b/src/ontologies/11-rdf.ontology
similarity index 100%
rename from data/ontologies/11-rdf.ontology
rename to src/ontologies/11-rdf.ontology
diff --git a/data/ontologies/12-nrl.description b/src/ontologies/12-nrl.description
similarity index 84%
rename from data/ontologies/12-nrl.description
rename to src/ontologies/12-nrl.description
index 9ba38a0..44a43b2 100644
--- a/data/ontologies/12-nrl.description
+++ b/src/ontologies/12-nrl.description
@@ -5,7 +5,7 @@
        dsc:description "Properties describing the ontologies.";
        dsc:author "Nepomuk People" ;
        dsc:editor "Tracker developers (translation into turtle)" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/12-nrl.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/12-nrl.ontology";;
 
        dsc:localPrefix "nrl" ;
        dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/08/15/nrl#"; ;
diff --git a/data/ontologies/12-nrl.ontology b/src/ontologies/12-nrl.ontology
similarity index 100%
rename from data/ontologies/12-nrl.ontology
rename to src/ontologies/12-nrl.ontology
diff --git a/data/ontologies/20-dc.description b/src/ontologies/20-dc.description
similarity index 83%
rename from data/ontologies/20-dc.description
rename to src/ontologies/20-dc.description
index d49b74b..64c4b59 100644
--- a/data/ontologies/20-dc.description
+++ b/src/ontologies/20-dc.description
@@ -6,7 +6,7 @@
 
        dsc:author "Dublin Core consortium" ;
        dsc:editor "Tracker developers (translation into turtle)" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/20-dc.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/20-dc.ontology";;
 
        dsc:localPrefix "dc" ;
        dsc:baseUrl "http://purl.org/dc/elements/1.1/";;
diff --git a/data/ontologies/20-dc.ontology b/src/ontologies/20-dc.ontology
similarity index 100%
rename from data/ontologies/20-dc.ontology
rename to src/ontologies/20-dc.ontology
diff --git a/data/ontologies/30-nie.description b/src/ontologies/30-nie.description
similarity index 93%
rename from data/ontologies/30-nie.description
rename to src/ontologies/30-nie.description
index 4f90990..9d123ca 100644
--- a/data/ontologies/30-nie.description
+++ b/src/ontologies/30-nie.description
@@ -9,7 +9,7 @@
        dsc:author "Michael Sintek, DFKI, &lt;michael sintek dfki de&gt;";
        dsc:author "Ludger van Elst, DFKI, &lt;elst dfki uni-kl de&gt;";
        dsc:editor "Antoni Mylka, DFKI, &lt;antoni mylka dfki de&gt;";
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/30-nie.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/30-nie.ontology";;
        dsc:contributor "Evgeny 'phreedom' Egorochkin, KDE Strigi Developer, &lt;stexx mail ru&gt;";
        dsc:contributor "Christiaan Fluit, Aduna, &lt;christiaan fluit aduna-software com&gt;";
 
diff --git a/data/ontologies/30-nie.ontology b/src/ontologies/30-nie.ontology
similarity index 100%
rename from data/ontologies/30-nie.ontology
rename to src/ontologies/30-nie.ontology
diff --git a/data/ontologies/31-nao.description b/src/ontologies/31-nao.description
similarity index 94%
rename from data/ontologies/31-nao.description
rename to src/ontologies/31-nao.description
index dc8b4e0..4a6646d 100644
--- a/data/ontologies/31-nao.description
+++ b/src/ontologies/31-nao.description
@@ -19,7 +19,7 @@
        dsc:contributor "Julien Gaugaz, L3S, &lt;gaugaz l3s de&gt;";
        dsc:contributor "Antoni Mylka, DFKI, &lt;antoni mylka dfki de&gt;";
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/31-nao.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/31-nao.ontology";;
        dsc:upstream "http://www.semanticdesktop.org/ontologies/nao/";;
 
        dsc:localPrefix "nao" ;
diff --git a/data/ontologies/31-nao.ontology b/src/ontologies/31-nao.ontology
similarity index 100%
rename from data/ontologies/31-nao.ontology
rename to src/ontologies/31-nao.ontology
diff --git a/data/ontologies/32-nco.description b/src/ontologies/32-nco.description
similarity index 94%
rename from data/ontologies/32-nco.description
rename to src/ontologies/32-nco.description
index b1b75a3..2f26de6 100644
--- a/data/ontologies/32-nco.description
+++ b/src/ontologies/32-nco.description
@@ -17,7 +17,7 @@
        dsc:contributor "Christiaan Fluit, Aduna, &lt;christiaan fluit aduna-software com&gt;";
 
        dsc:upstream "http://www.semanticdesktop.org/ontologies/nco/";;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/32-nco.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/32-nco.ontology";;
 
        dsc:localPrefix "nco" ;
        dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/03/22/nco#"; ;
diff --git a/data/ontologies/32-nco.ontology b/src/ontologies/32-nco.ontology
similarity index 100%
rename from data/ontologies/32-nco.ontology
rename to src/ontologies/32-nco.ontology
diff --git a/data/ontologies/33-nfo.description b/src/ontologies/33-nfo.description
similarity index 94%
rename from data/ontologies/33-nfo.description
rename to src/ontologies/33-nfo.description
index 9ed4c52..f7e6345 100644
--- a/data/ontologies/33-nfo.description
+++ b/src/ontologies/33-nfo.description
@@ -4,7 +4,7 @@
        dsc:title "Nepomuk File Ontology (NFO)" ;
        dsc:description "About files and other desktop resources." ;
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/33-nfo.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/33-nfo.ontology";;
        dsc:upstream "http://www.semanticdesktop.org/ontologies/nfo/";;
 
        dsc:author "Antoni Mylka, DFKI, &lt;antoni mylka dfki de&gt;";
diff --git a/data/ontologies/33-nfo.ontology b/src/ontologies/33-nfo.ontology
similarity index 100%
rename from data/ontologies/33-nfo.ontology
rename to src/ontologies/33-nfo.ontology
diff --git a/data/ontologies/34-nmo.description b/src/ontologies/34-nmo.description
similarity index 100%
rename from data/ontologies/34-nmo.description
rename to src/ontologies/34-nmo.description
diff --git a/data/ontologies/34-nmo.ontology b/src/ontologies/34-nmo.ontology
similarity index 100%
rename from data/ontologies/34-nmo.ontology
rename to src/ontologies/34-nmo.ontology
diff --git a/data/ontologies/35-ncal.description b/src/ontologies/35-ncal.description
similarity index 93%
rename from data/ontologies/35-ncal.description
rename to src/ontologies/35-ncal.description
index 9d53335..482037d 100644
--- a/data/ontologies/35-ncal.description
+++ b/src/ontologies/35-ncal.description
@@ -15,7 +15,7 @@
        dsc:contributor "Evgeny 'phreedom' Egorochkin, KDE Strigi Developer, &lt;stexx mail ru&gt;";
        dsc:contributor "Christiaan Fluit, Aduna, &lt;christiaan fluit aduna-software com&gt;";
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/35-ncal.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/35-ncal.ontology";;
        dsc:upstream "http://www.semanticdesktop.org/ontologies/ncal/";;
 
        dsc:localPrefix "ncal" ;
diff --git a/data/ontologies/35-ncal.ontology b/src/ontologies/35-ncal.ontology
similarity index 100%
rename from data/ontologies/35-ncal.ontology
rename to src/ontologies/35-ncal.ontology
diff --git a/data/ontologies/36-scal.description b/src/ontologies/36-scal.description
similarity index 84%
rename from data/ontologies/36-scal.description
rename to src/ontologies/36-scal.description
index c8faf24..d85db7b 100644
--- a/data/ontologies/36-scal.description
+++ b/src/ontologies/36-scal.description
@@ -5,7 +5,7 @@
        dsc:description "Simple and efficient ontology to represent calendar information (events, ToDos, 
recurrency rules...)" ;
        dsc:author "Tracker Developers" ;
        dsc:editor "Tracker Developers" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/36-scal.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/36-scal.ontology";;
 
        dsc:localPrefix "scal" ;
        dsc:baseUrl "http://www.tracker-project.org/temp/scal#"; ;
diff --git a/data/ontologies/36-scal.ontology b/src/ontologies/36-scal.ontology
similarity index 100%
rename from data/ontologies/36-scal.ontology
rename to src/ontologies/36-scal.ontology
diff --git a/data/ontologies/37-nid3.description b/src/ontologies/37-nid3.description
similarity index 84%
rename from data/ontologies/37-nid3.description
rename to src/ontologies/37-nid3.description
index 41784ad..5f92d48 100644
--- a/data/ontologies/37-nid3.description
+++ b/src/ontologies/37-nid3.description
@@ -5,7 +5,7 @@
        dsc:description "Deprecated ontology to describe music. Please check NMM." ;
        dsc:author "Nepomuk people" ;
        dsc:editor "Tracker Developers (turtle translation)" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/37-nid3.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/37-nid3.ontology";;
 
        dsc:localPrefix "nid3" ;
        dsc:baseUrl "http://www.semanticdesktop.org/ontologies/2007/05/10/nid3#"; ;
diff --git a/data/ontologies/37-nid3.ontology b/src/ontologies/37-nid3.ontology
similarity index 100%
rename from data/ontologies/37-nid3.ontology
rename to src/ontologies/37-nid3.ontology
diff --git a/data/ontologies/38-nmm.description b/src/ontologies/38-nmm.description
similarity index 86%
rename from data/ontologies/38-nmm.description
rename to src/ontologies/38-nmm.description
index b8bd259..cff6160 100644
--- a/data/ontologies/38-nmm.description
+++ b/src/ontologies/38-nmm.description
@@ -9,7 +9,7 @@
        dsc:editor "Urho Konttori &lt;urho konttori nokia com&gt;" ;
        dsc:editor "Ivan Frade &lt;ivan frade nokia com&gt;" ;
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/38-nmm.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/38-nmm.ontology";;
 
        dsc:localPrefix "nmm" ;
        dsc:baseUrl "http://www.tracker-project.org/temp/nmm#"; ;
diff --git a/data/ontologies/38-nmm.ontology b/src/ontologies/38-nmm.ontology
similarity index 100%
rename from data/ontologies/38-nmm.ontology
rename to src/ontologies/38-nmm.ontology
diff --git a/data/ontologies/39-mto.description b/src/ontologies/39-mto.description
similarity index 86%
rename from data/ontologies/39-mto.description
rename to src/ontologies/39-mto.description
index f450225..b2af3cb 100644
--- a/data/ontologies/39-mto.description
+++ b/src/ontologies/39-mto.description
@@ -9,7 +9,7 @@
 
        dsc:editor "Ivan Frade &lt;ivan frade nokia com&gt;" ;
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/39-mto.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/39-mto.ontology";;
 
        dsc:localPrefix "mto" ;
        dsc:baseUrl "http://www.tracker-project.org/temp/mto#"; ;
diff --git a/data/ontologies/39-mto.ontology b/src/ontologies/39-mto.ontology
similarity index 100%
rename from data/ontologies/39-mto.ontology
rename to src/ontologies/39-mto.ontology
diff --git a/data/ontologies/40-mlo.description b/src/ontologies/40-mlo.description
similarity index 85%
rename from data/ontologies/40-mlo.description
rename to src/ontologies/40-mlo.description
index 3f6461f..e724fc6 100644
--- a/data/ontologies/40-mlo.description
+++ b/src/ontologies/40-mlo.description
@@ -7,7 +7,7 @@
        dsc:author "Ivan Frade &lt;ivan frade nokia com&gt;" ;
        dsc:editor "Ivan Frade &lt;ivan frade nokia com&gt;" ;
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/40-mlo.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/40-mlo.ontology";;
 
        dsc:baseUrl "http://www.tracker-project.org/temp/mlo#"; ;
        dsc:localPrefix "mlo" ;
diff --git a/data/ontologies/40-mlo.ontology b/src/ontologies/40-mlo.ontology
similarity index 100%
rename from data/ontologies/40-mlo.ontology
rename to src/ontologies/40-mlo.ontology
diff --git a/data/ontologies/41-mfo.description b/src/ontologies/41-mfo.description
similarity index 86%
rename from data/ontologies/41-mfo.description
rename to src/ontologies/41-mfo.description
index 146580f..75e9663 100644
--- a/data/ontologies/41-mfo.description
+++ b/src/ontologies/41-mfo.description
@@ -9,7 +9,7 @@
 
        dsc:editor "Ivan Frade &lt;ivan frade nokia com&gt;" ;
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/41-mfo.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/41-mfo.ontology";;
 
        dsc:localPrefix "mfo" ;
        dsc:baseUrl "http://www.tracker-project.org/temp/mfo#"; ;
diff --git a/data/ontologies/41-mfo.ontology b/src/ontologies/41-mfo.ontology
similarity index 100%
rename from data/ontologies/41-mfo.ontology
rename to src/ontologies/41-mfo.ontology
diff --git a/data/ontologies/89-mtp.description b/src/ontologies/89-mtp.description
similarity index 85%
rename from data/ontologies/89-mtp.description
rename to src/ontologies/89-mtp.description
index 2123e7e..aaf0815 100644
--- a/data/ontologies/89-mtp.description
+++ b/src/ontologies/89-mtp.description
@@ -6,7 +6,7 @@
 
        dsc:author "Ivan Frade &lt;ivan frade nokia com&gt;" ;
        dsc:editor "Ivan Frade &lt;ivan frade nokia com&gt;" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/89-mtp.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/89-mtp.ontology";;
 
        dsc:localPrefix "mtp" ;
        dsc:baseUrl "http://www.tracker-project.org/temp/mtp#"; ;
diff --git a/data/ontologies/89-mtp.ontology b/src/ontologies/89-mtp.ontology
similarity index 100%
rename from data/ontologies/89-mtp.ontology
rename to src/ontologies/89-mtp.ontology
diff --git a/data/ontologies/90-tracker.description b/src/ontologies/90-tracker.description
similarity index 82%
rename from data/ontologies/90-tracker.description
rename to src/ontologies/90-tracker.description
index e725509..b01c9e2 100644
--- a/data/ontologies/90-tracker.description
+++ b/src/ontologies/90-tracker.description
@@ -6,7 +6,7 @@
 
        dsc:author "Tracker developers" ;
        dsc:editor "Tracker developers" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/90-tracker.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/90-tracker.ontology";;
 
        dsc:localPrefix "tracker" ;
        dsc:baseUrl "http://www.tracker-project.org/ontologies/tracker#";;
diff --git a/data/ontologies/90-tracker.ontology b/src/ontologies/90-tracker.ontology
similarity index 100%
rename from data/ontologies/90-tracker.ontology
rename to src/ontologies/90-tracker.ontology
diff --git a/data/ontologies/91-maemo.description b/src/ontologies/91-maemo.description
similarity index 82%
rename from data/ontologies/91-maemo.description
rename to src/ontologies/91-maemo.description
index cd98266..b0e97a8 100644
--- a/data/ontologies/91-maemo.description
+++ b/src/ontologies/91-maemo.description
@@ -6,7 +6,7 @@
 
        dsc:author "Tracker developers" ;
        dsc:editor "Tracker developers" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/91-maemo.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/91-maemo.ontology";;
 
        dsc:localPrefix "maemo" ;
        dsc:baseUrl "http://maemo.org/ontologies/tracker#"; ;
diff --git a/data/ontologies/91-maemo.ontology b/src/ontologies/91-maemo.ontology
similarity index 100%
rename from data/ontologies/91-maemo.ontology
rename to src/ontologies/91-maemo.ontology
diff --git a/data/ontologies/92-slo.description b/src/ontologies/92-slo.description
similarity index 85%
rename from data/ontologies/92-slo.description
rename to src/ontologies/92-slo.description
index e07e61e..7f648ee 100644
--- a/data/ontologies/92-slo.description
+++ b/src/ontologies/92-slo.description
@@ -7,7 +7,7 @@
        dsc:author "Ivan Frade &lt;ivan frade nokia com&gt;" ;
        dsc:editor "Ivan Frade &lt;ivan frade nokia com&gt;" ;
 
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/92-slo.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/92-slo.ontology";;
 
        dsc:baseUrl "http://www.tracker-project.org/temp/slo#"; ;
        dsc:localPrefix "slo" ;
diff --git a/data/ontologies/92-slo.ontology b/src/ontologies/92-slo.ontology
similarity index 100%
rename from data/ontologies/92-slo.ontology
rename to src/ontologies/92-slo.ontology
diff --git a/data/ontologies/93-libosinfo.description b/src/ontologies/93-libosinfo.description
similarity index 82%
rename from data/ontologies/93-libosinfo.description
rename to src/ontologies/93-libosinfo.description
index 290c123..41c78c8 100644
--- a/data/ontologies/93-libosinfo.description
+++ b/src/ontologies/93-libosinfo.description
@@ -6,7 +6,7 @@
 
        dsc:author "Red Hat, Inc" ;
        dsc:editor "Red Hat, Inc" ;
-       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/data/ontologies/93-libosinfo.ontology";;
+       dsc:gitlog "http://git.gnome.org/cgit/tracker/log/src/ontologies/93-libosinfo.ontology";;
 
        dsc:localPrefix "osinfo" ;
        dsc:baseUrl "http://www.tracker-project.org/ontologies/osinfo#";;
diff --git a/data/ontologies/93-libosinfo.ontology b/src/ontologies/93-libosinfo.ontology
similarity index 100%
rename from data/ontologies/93-libosinfo.ontology
rename to src/ontologies/93-libosinfo.ontology
diff --git a/data/ontologies/Indices.list b/src/ontologies/Indices.list
similarity index 100%
rename from data/ontologies/Indices.list
rename to src/ontologies/Indices.list
diff --git a/data/ontologies/Makefile.am b/src/ontologies/Makefile.am
similarity index 87%
rename from data/ontologies/Makefile.am
rename to src/ontologies/Makefile.am
index cefd1d0..d898b8a 100644
--- a/data/ontologies/Makefile.am
+++ b/src/ontologies/Makefile.am
@@ -26,11 +26,10 @@ config_DATA =                                          \
        93-libosinfo.ontology 93-libosinfo.description
 
 if HAVE_MAEMO
-config_DATA +=                                         \
-       $(maemo_ontology)
+config_DATA += $(maemo_ontology)
 endif
 
-EXTRA_DIST =                                           \
-       $(maemo_ontology)                              \
+EXTRA_DIST = \
+       $(maemo_ontology) \
        $(config_DATA)
 
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index 74228da..1dbf17f 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -246,7 +246,7 @@ setup (TestInfo      *info,
 
                g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
                g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/ontologies/", TRUE));
        }
 }
 
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c 
b/tests/libtracker-data/tracker-ontology-change-test.c
index a650768..1f15efd 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -318,7 +318,7 @@ main (int argc, char **argv)
 
        g_setenv ("XDG_DATA_HOME", data_dir, TRUE);
        g_setenv ("XDG_CACHE_HOME", data_dir, TRUE);
-       g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
+       g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE);
 
        /* add test cases */
 
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index 307ccf6..ce5bce8 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -292,7 +292,7 @@ setup (TestInfo *info,
 
                g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
                g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
        }
 }
 
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c 
b/tests/libtracker-data/tracker-sparql-blank-test.c
index d3b795c..da6c8bd 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/libtracker-data/tracker-sparql-blank-test.c
@@ -147,7 +147,7 @@ setup (TestInfo      *info,
 
                g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
                g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
        }
 }
 
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index 939bb31..4ecec72 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -340,7 +340,7 @@ setup (TestInfo      *info,
 
                g_assert_true (g_setenv ("XDG_DATA_HOME", xdg_location, TRUE));
                g_assert_true (g_setenv ("XDG_CACHE_HOME", xdg_location, TRUE));
-               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE));
+               g_assert_true (g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE));
        }
 }
 
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
index 7adcd5f..5b301b6 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/libtracker-fts/tracker-fts-test.c
@@ -187,7 +187,7 @@ main (int argc, char **argv)
 
        g_setenv ("XDG_DATA_HOME", current_dir, TRUE);
        g_setenv ("XDG_CACHE_HOME", current_dir, TRUE);
-       g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/data/ontologies/", TRUE);
+       g_setenv ("TRACKER_DB_ONTOLOGIES_DIR", TOP_SRCDIR "/src/ontologies/", TRUE);
        g_setenv ("TRACKER_FTS_STOP_WORDS", "0", TRUE);
 
        g_free (current_dir);
diff --git a/utils/ontology/README.example b/utils/ontology/README.example
index 42edbc5..48277a2 100644
--- a/utils/ontology/README.example
+++ b/utils/ontology/README.example
@@ -9,7 +9,7 @@
 
    E.g.
 
- ./ttl2html -f ../../data/ontologies/39-mto.ontology -u http://www.tracker-project.org/temp/mto#
+   ./ttl2html -f ../../src/ontologies/39-mto.ontology -u http://www.tracker-project.org/temp/mto#
 
 
 == ontology-validator ==
@@ -20,7 +20,7 @@
 
    It receives as parameter the ontology files directory. Usually:
 
- ./ontology-validator -o ../../data/ontologies
+   ./ontology-validator -o ../../src/ontologies
 
 
 == Deprecated ==
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]