data: Moved data/languages to src/libtracker-common/stop-words

Only API in libtracker-common uses these

23 files changed, 26 insertions, 25 deletions

diff --git a/configure.ac b/configure.ac
index fc6afe77f..e35104a7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2557,7 +2557,6 @@ AM_CONDITIONAL(HAVE_ARTWORK, test "x$have_artwork" = "xyes")
 
 AC_CONFIG_FILES([
 	data/gschemas/Makefile
-	data/languages/Makefile
 	data/Makefile
 	data/miners/Makefile
 	docs/Makefile
@@ -2577,6 +2576,7 @@ AC_CONFIG_FILES([
 	po/Makefile.in
 	src/gvdb/Makefile
 	src/libtracker-common/Makefile
+	src/libtracker-common/stop-words/Makefile
 	src/libtracker-sparql/Makefile
 	src/libtracker-sparql/tracker-sparql.pc
 	src/libtracker-bus/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index aa3f18cc2..1c1b51aaf 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1 +1 @@
-SUBDIRS = languages miners gschemas
+SUBDIRS = miners gschemas
diff --git a/data/languages/Makefile.am b/data/languages/Makefile.am
deleted file mode 100644
index 3cbafc7e2..000000000
--- a/data/languages/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-configdir = $(datadir)/tracker/languages
-
-config_DATA =                                          \
-	stopwords.da                                   \
-	stopwords.de                                   \
-	stopwords.en                                   \
-	stopwords.es                                   \
-	stopwords.fi                                   \
-	stopwords.fr                                   \
-	stopwords.hu                                   \
-	stopwords.it                                   \
-	stopwords.nb                                   \
-	stopwords.nl                                   \
-	stopwords.pt                                   \
-	stopwords.ru                                   \
-	stopwords.sv
-
-EXTRA_DIST = $(config_DATA)
diff --git a/src/libtracker-common/Makefile.am b/src/libtracker-common/Makefile.am
index fb7941d81..d2660a075 100644
--- a/src/libtracker-common/Makefile.am
+++ b/src/libtracker-common/Makefile.am
@@ -1,3 +1,5 @@
+SUBDIRS = stop-words
+
 AM_CPPFLAGS = \
 	$(BUILD_CFLAGS) \
 	-I$(top_srcdir)/src \
diff --git a/src/libtracker-common/stop-words/Makefile.am b/src/libtracker-common/stop-words/Makefile.am
new file mode 100644
index 000000000..745df2362
--- /dev/null
+++ b/src/libtracker-common/stop-words/Makefile.am
@@ -0,0 +1,17 @@
+configdir = $(datadir)/tracker/stop-words
+config_DATA = \
+	stopwords.da \
+	stopwords.de \
+	stopwords.en \
+	stopwords.es \
+	stopwords.fi \
+	stopwords.fr \
+	stopwords.hu \
+	stopwords.it \
+	stopwords.nb \
+	stopwords.nl \
+	stopwords.pt \
+	stopwords.ru \
+	stopwords.sv
+
+EXTRA_DIST = $(config_DATA)
diff --git a/data/languages/stopwords.da b/src/libtracker-common/stop-words/stopwords.da
index e8522ef06..e8522ef06 100644
--- a/data/languages/stopwords.da
+++ b/src/libtracker-common/stop-words/stopwords.da
diff --git a/data/languages/stopwords.de b/src/libtracker-common/stop-words/stopwords.de
index 8464fccb8..8464fccb8 100644
--- a/data/languages/stopwords.de
+++ b/src/libtracker-common/stop-words/stopwords.de
diff --git a/data/languages/stopwords.en b/src/libtracker-common/stop-words/stopwords.en
index 83be25a1d..83be25a1d 100644
--- a/data/languages/stopwords.en
+++ b/src/libtracker-common/stop-words/stopwords.en
diff --git a/data/languages/stopwords.es b/src/libtracker-common/stop-words/stopwords.es
index 90a366aee..90a366aee 100644
--- a/data/languages/stopwords.es
+++ b/src/libtracker-common/stop-words/stopwords.es
diff --git a/data/languages/stopwords.fi b/src/libtracker-common/stop-words/stopwords.fi
index 3b468b32c..3b468b32c 100644
--- a/data/languages/stopwords.fi
+++ b/src/libtracker-common/stop-words/stopwords.fi
diff --git a/data/languages/stopwords.fr b/src/libtracker-common/stop-words/stopwords.fr
index a02063baf..a02063baf 100644
--- a/data/languages/stopwords.fr
+++ b/src/libtracker-common/stop-words/stopwords.fr
diff --git a/data/languages/stopwords.hu b/src/libtracker-common/stop-words/stopwords.hu
index 694feb102..694feb102 100644
--- a/data/languages/stopwords.hu
+++ b/src/libtracker-common/stop-words/stopwords.hu
diff --git a/data/languages/stopwords.it b/src/libtracker-common/stop-words/stopwords.it
index 992b33510..992b33510 100644
--- a/data/languages/stopwords.it
+++ b/src/libtracker-common/stop-words/stopwords.it
diff --git a/data/languages/stopwords.nb b/src/libtracker-common/stop-words/stopwords.nb
index bb9edb15e..bb9edb15e 100644
--- a/data/languages/stopwords.nb
+++ b/src/libtracker-common/stop-words/stopwords.nb
diff --git a/data/languages/stopwords.nl b/src/libtracker-common/stop-words/stopwords.nl
index 300c36833..300c36833 100644
--- a/data/languages/stopwords.nl
+++ b/src/libtracker-common/stop-words/stopwords.nl
diff --git a/data/languages/stopwords.pt b/src/libtracker-common/stop-words/stopwords.pt
index 66d557f9c..66d557f9c 100644
--- a/data/languages/stopwords.pt
+++ b/src/libtracker-common/stop-words/stopwords.pt
diff --git a/data/languages/stopwords.ru b/src/libtracker-common/stop-words/stopwords.ru
index dc820c0e9..dc820c0e9 100644
--- a/data/languages/stopwords.ru
+++ b/src/libtracker-common/stop-words/stopwords.ru
diff --git a/data/languages/stopwords.sv b/src/libtracker-common/stop-words/stopwords.sv
index 0f303130e..0f303130e 100644
--- a/data/languages/stopwords.sv
+++ b/src/libtracker-common/stop-words/stopwords.sv
diff --git a/src/libtracker-common/tracker-language.c b/src/libtracker-common/tracker-language.c
index 73096b234..cb8d717e9 100644
--- a/src/libtracker-common/tracker-language.c
+++ b/src/libtracker-common/tracker-language.c
@@ -235,7 +235,7 @@ language_get_stopword_filename (const gchar *language_code)
 	if (!testpath) {
 		filename = g_build_filename (SHAREDIR,
 		                             "tracker",
-		                             "languages",
+		                             "stop-words",
 		                             str,
 		                             NULL);
 	} else {
diff --git a/tests/functional-tests/310-fts-indexing.py b/tests/functional-tests/310-fts-indexing.py
index 99db45d1c..99152bb29 100755
--- a/tests/functional-tests/310-fts-indexing.py
+++ b/tests/functional-tests/310-fts-indexing.py
@@ -288,7 +288,7 @@ class MinerFTSStopwordsTest (CommonMinerFTS):
         if "_" in langcode:
             langcode = langcode.split ("_")[0]
 
-        stopwordsfile = os.path.join (cfg.DATADIR, "tracker", "languages", "stopwords." + langcode)
+        stopwordsfile = os.path.join (cfg.DATADIR, "tracker", "stop-words", "stopwords." + langcode)
 
         if not os.path.exists (stopwordsfile):
             self.skipTest ("No stopwords for the current locale ('%s' doesn't exist)" % (stopwordsfile))
diff --git a/tests/functional-tests/fts-tc.py b/tests/functional-tests/fts-tc.py
index 1c5686dd3..620802b24 100644
--- a/tests/functional-tests/fts-tc.py
+++ b/tests/functional-tests/fts-tc.py
@@ -469,7 +469,7 @@ class stopwords (TestUpdate):
 	file_path =  configuration.MYDOCS + TEST_TEXT                   
                                                                         
         """copy the test files """                                      
-	test_file='/usr/share/tracker/languages/stopwords.en'
+	test_file='/usr/share/tracker/stop-words/stopwords.en'
 	f1=open(test_file,'r')
 	lines = f1.readlines()
 	f1.close()
diff --git a/tests/libtracker-fts/tracker-parser-test.c b/tests/libtracker-fts/tracker-parser-test.c
index 50e3402e2..7596742a0 100644
--- a/tests/libtracker-fts/tracker-parser-test.c
+++ b/tests/libtracker-fts/tracker-parser-test.c
@@ -359,7 +359,7 @@ main (int argc, char **argv)
 	 *  need to set the following envvar with the path where the
 	 *  dictionaries are. */
 	g_setenv ("TRACKER_LANGUAGE_STOP_WORDS_DIR",
-	          TOP_SRCDIR "/data/languages",
+	          TOP_SRCDIR "/src/libtracker-common/stop-words",
 	          TRUE);
 
 	/* Add normalization checks */
diff --git a/utils/sandbox/tracker-sandbox.py b/utils/sandbox/tracker-sandbox.py
index de8d9f686..7018432a0 100755
--- a/utils/sandbox/tracker-sandbox.py
+++ b/utils/sandbox/tracker-sandbox.py
@@ -349,7 +349,7 @@ def environment_set():
 
 		os.environ['TRACKER_DB_ONTOLOGIES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'ontologies')
 		os.environ['TRACKER_EXTRACTOR_RULES_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'extract-rules')
-		os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'languages')
+		os.environ['TRACKER_LANGUAGE_STOPWORDS_DIR'] = os.path.join(opts.prefix, 'share', 'tracker', 'stop-words')
 
 	# Preferences
 	os.environ['TRACKER_USE_CONFIG_FILES'] = 'yes'