[tracker] Merge libtracker-db into libtracker-data

From: Jürg Billeter <juergbi src gnome org>
To: commits-list gnome org
Cc:
Subject: [tracker] Merge libtracker-db into libtracker-data
Date: Tue, 20 Jul 2010 09:41:12 +0000 (UTC)
commit 7a18f73ee5408d839d1408c645f6d84ca2a5a245
Author: JÃ¼rg Billeter <j bitron ch>
Date:   Mon Jul 5 15:52:00 2010 +0200

    Merge libtracker-db into libtracker-data

 configure.ac                                       |    1 -
 src/Makefile.am                                    |    1 -
 src/libtracker-data/Makefile.am                    |   23 +-
 src/libtracker-data/libtracker-data.vapi           |   48 ++-
 src/libtracker-data/tracker-data-backup.c          |    6 +-
 src/libtracker-data/tracker-data-manager.c         |    7 +-
 src/libtracker-data/tracker-data-manager.h         |    5 +-
 src/libtracker-data/tracker-data-query.c           |    7 +-
 src/libtracker-data/tracker-data-query.h           |    2 +-
 src/libtracker-data/tracker-data-update.c          |    7 +-
 src/libtracker-data/tracker-data-update.h          |    2 +-
 src/libtracker-data/tracker-data.h                 |    6 +
 .../tracker-db-config.c                            |    0
 .../tracker-db-config.h                            |    0
 .../tracker-db-dbus.c                              |    0
 .../tracker-db-dbus.h                              |    4 +-
 .../tracker-db-interface-sqlite.c                  |    0
 .../tracker-db-interface-sqlite.h                  |    4 +-
 .../tracker-db-interface.c                         |    0
 .../tracker-db-interface.h                         |    4 +-
 .../tracker-db-journal.c                           |    0
 .../tracker-db-journal.h                           |    0
 .../tracker-db-manager.c                           |    0
 .../tracker-db-manager.h                           |    4 +-
 src/libtracker-db/COPYING.LIB                      |  510 --------------------
 src/libtracker-db/Makefile.am                      |   48 --
 src/libtracker-db/libtracker-db.vapi               |   67 ---
 src/libtracker-db/tracker-db.h                     |   42 --
 src/libtracker-fts/tracker-fts.c                   |    2 +-
 src/miners/fs/Makefile.am                          |    2 +-
 src/miners/fs/tracker-main.c                       |    4 +-
 src/miners/fs/tracker-miner-files.c                |    2 +-
 src/plugins/kmail/Makefile.am                      |    2 +-
 src/tracker-control/Makefile.am                    |    2 +-
 src/tracker-control/tracker-control.c              |    2 +-
 src/tracker-store/Makefile.am                      |    1 -
 src/tracker-store/tracker-dbus.c                   |    5 +-
 src/tracker-store/tracker-main.c                   |    8 +-
 src/tracker-store/tracker-resource-class.c         |    3 +-
 src/tracker-store/tracker-resources.c              |    3 +-
 src/tracker-store/tracker-statistics.c             |    5 +-
 src/tracker-store/tracker-store.c                  |    4 +-
 src/tracker-store/tracker-store.h                  |    2 +-
 src/tracker-utils/Makefile.am                      |    1 -
 tests/Makefile.am                                  |    1 -
 tests/libtracker-data/Makefile.am                  |    1 -
 tests/libtracker-data/tracker-backup-test.c        |    4 +-
 .../libtracker-data/tracker-ontology-change-test.c |    7 +-
 tests/libtracker-data/tracker-ontology-test.c      |    3 +-
 tests/libtracker-data/tracker-sparql-blank-test.c  |    3 +-
 tests/libtracker-data/tracker-sparql-test.c        |    2 +-
 tests/libtracker-db/Makefile.am                    |   10 +-
 tests/libtracker-db/tracker-db-dbus-test.c         |    2 +-
 tests/libtracker-db/tracker-db-journal.c           |    2 +-
 tests/libtracker-db/tracker-db-manager-common.h    |    2 +-
 .../libtracker-db/tracker-db-manager-test-attach.c |    2 +-
 .../libtracker-db/tracker-db-manager-test-custom.c |    2 +-
 .../tracker-db-manager-test-unattach.c             |    2 +-
 tests/libtracker-fts/Makefile.am                   |    1 -
 tests/libtracker-fts/tracker-fts-test.c            |    3 +-
 tests/tracker-miner-fs/Makefile.am                 |    1 -
 61 files changed, 135 insertions(+), 759 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index aa1b8eb..618b3d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1865,7 +1865,6 @@ AC_CONFIG_FILES([
 	src/libstemmer/Makefile
 	src/libtracker-common/Makefile
 	src/libtracker-data/Makefile
-	src/libtracker-db/Makefile
 	src/libtracker-fts/Makefile
 	src/libtracker-extract/Makefile
 	src/libtracker-client/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 0bbccf4..ac155fe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,6 @@ SUBDIRS = 					\
 	libtracker-common 			\
 	libtracker-client			\
 	$(libtrackerfts_dir)			\
-	libtracker-db				\
 	libtracker-data				\
 	libtracker-extract			\
 	libtracker-miner			\
diff --git a/src/libtracker-data/Makefile.am b/src/libtracker-data/Makefile.am
index e4af783..7a37b87 100644
--- a/src/libtracker-data/Makefile.am
+++ b/src/libtracker-data/Makefile.am
@@ -32,6 +32,12 @@ libtracker_data_la_SOURCES = 						\
 	tracker-data-manager.c						\
 	tracker-data-query.c						\
 	tracker-data-update.c						\
+	tracker-db-config.c						\
+	tracker-db-dbus.c						\
+	tracker-db-interface.c						\
+	tracker-db-interface-sqlite.c					\
+	tracker-db-manager.c						\
+	tracker-db-journal.c						\
 	tracker-namespace.c						\
 	tracker-ontology.c						\
 	tracker-ontologies.c						\
@@ -46,6 +52,12 @@ noinst_HEADERS =							\
 	tracker-data-manager.h						\
 	tracker-data-query.h						\
 	tracker-data-update.h						\
+	tracker-db-config.h						\
+	tracker-db-dbus.h						\
+	tracker-db-interface.h						\
+	tracker-db-interface-sqlite.h					\
+	tracker-db-manager.h 						\
+	tracker-db-journal.h						\
 	tracker-namespace.h						\
 	tracker-ontology.h						\
 	tracker-ontologies.h						\
@@ -56,7 +68,6 @@ vapi_sources =								\
 	$(top_srcdir)/src/vapi/posix.vapi				\
 	$(top_srcdir)/src/vapi/glib-2.0-fixes.vapi			\
 	$(top_srcdir)/src/libtracker-common/libtracker-common.vapi	\
-	$(top_srcdir)/src/libtracker-db/libtracker-db.vapi		\
 	libtracker-data.vapi
 
 libtracker-data.vala.stamp: $(libtracker_data_la_VALASOURCES) $(vapi_sources)
@@ -68,12 +79,18 @@ libtracker_data_la_LDFLAGS =						\
 
 libtracker_data_la_LIBADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la		\
+	$(SQLITE3_LIBS)							\
 	$(DBUS_LIBS)							\
 	$(GLIB2_LIBS)							\
 	$(UUID_LIBS)							\
 	$(GCOV_LIBS)							\
-	-lz
+	-lz								\
+	-lm
+
+if HAVE_TRACKER_FTS
+libtracker_data_la_LIBADD += 						\
+	$(top_builddir)/src/libtracker-fts/libtracker-fts.la
+endif
 
 MAINTAINERCLEANFILES =							\
 	libtracker-data.vala.stamp					\
diff --git a/src/libtracker-data/libtracker-data.vapi b/src/libtracker-data/libtracker-data.vapi
index a840977..b017199 100644
--- a/src/libtracker-data/libtracker-data.vapi
+++ b/src/libtracker-data/libtracker-data.vapi
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2009, Nokia
+ * Copyright (C) 2008-2010, Nokia
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,6 +18,52 @@
  */
 
 namespace Tracker {
+	[CCode (cheader_filename = "libtracker-data/tracker-db-manager.h")]
+	public enum DB {
+		UNKNOWN,
+		COMMON,
+		CACHE,
+		METADATA,
+		CONTENTS
+	}
+
+	[CCode (cprefix = "TRACKER_DB_", cheader_filename = "libtracker-data/tracker-db-interface.h")]
+	public errordomain DBInterfaceError {
+		QUERY_ERROR,
+		CORRUPT,
+		INTERRUPTED
+	}
+
+	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
+	public interface DBInterface : GLib.Object {
+		[PrintfFormat]
+		public abstract DBStatement create_statement (...) throws DBInterfaceError;
+	}
+
+	[CCode (cheader_filename = "libtracker-data/tracker-db-manager.h")]
+	namespace DBManager {
+		public unowned DBInterface get_db_interface ();
+	}
+
+	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
+	public class DBResultSet : GLib.Object {
+		public void _get_value (uint column, out GLib.Value value);
+		public bool iter_next ();
+	}
+
+	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
+	public class DBCursor : GLib.Object {
+	}
+
+	[CCode (cheader_filename = "libtracker-data/tracker-db-interface.h")]
+	public interface DBStatement : GLib.Object {
+		public abstract void bind_double (int index, double value);
+		public abstract void bind_int (int index, int value);
+		public abstract void bind_text (int index, string value);
+		public abstract DBResultSet execute () throws DBInterfaceError;
+		public abstract DBCursor start_cursor () throws DBInterfaceError;
+	}
+
 	[CCode (cheader_filename = "libtracker-data/tracker-class.h")]
 	public class Class : GLib.Object {
 		public string name { get; set; }
diff --git a/src/libtracker-data/tracker-data-backup.c b/src/libtracker-data/tracker-data-backup.c
index c92744e..96fad9b 100644
--- a/src/libtracker-data/tracker-data-backup.c
+++ b/src/libtracker-data/tracker-data-backup.c
@@ -24,12 +24,12 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 
-#include <libtracker-db/tracker-db-manager.h>
-#include <libtracker-db/tracker-db-journal.h>
-#include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-common/tracker-os-dependant.h>
 
 #include "tracker-data-backup.h"
+#include "tracker-data-manager.h"
+#include "tracker-db-manager.h"
+#include "tracker-db-journal.h"
 
 typedef struct {
 	GFile *destination, *journal;
diff --git a/src/libtracker-data/tracker-data-manager.c b/src/libtracker-data/tracker-data-manager.c
index dbed6cb..cabb45c 100644
--- a/src/libtracker-data/tracker-data-manager.c
+++ b/src/libtracker-data/tracker-data-manager.c
@@ -36,13 +36,12 @@
 #include <libtracker-fts/tracker-fts.h>
 #endif
 
-#include <libtracker-db/tracker-db-interface-sqlite.h>
-#include <libtracker-db/tracker-db-manager.h>
-#include <libtracker-db/tracker-db-journal.h>
-
 #include "tracker-class.h"
 #include "tracker-data-manager.h"
 #include "tracker-data-update.h"
+#include "tracker-db-interface-sqlite.h"
+#include "tracker-db-manager.h"
+#include "tracker-db-journal.h"
 #include "tracker-namespace.h"
 #include "tracker-ontologies.h"
 #include "tracker-ontology.h"
diff --git a/src/libtracker-data/tracker-data-manager.h b/src/libtracker-data/tracker-data-manager.h
index d5b4482..8b8a4fa 100644
--- a/src/libtracker-data/tracker-data-manager.h
+++ b/src/libtracker-data/tracker-data-manager.h
@@ -29,9 +29,8 @@
 #include <libtracker-common/tracker-ontologies.h>
 
 #include <libtracker-data/tracker-data-update.h>
-
-#include <libtracker-db/tracker-db-interface.h>
-#include <libtracker-db/tracker-db-manager.h>
+#include <libtracker-data/tracker-db-interface.h>
+#include <libtracker-data/tracker-db-manager.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-data/tracker-data-query.c b/src/libtracker-data/tracker-data-query.c
index 36c57fa..310d7a5 100644
--- a/src/libtracker-data/tracker-data-query.c
+++ b/src/libtracker-data/tracker-data-query.c
@@ -27,13 +27,12 @@
 
 #include <libtracker-common/tracker-common.h>
 
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-interface-sqlite.h>
-#include <libtracker-db/tracker-db-manager.h>
-
 #include "tracker-class.h"
 #include "tracker-data-manager.h"
 #include "tracker-data-query.h"
+#include "tracker-db-dbus.h"
+#include "tracker-db-interface-sqlite.h"
+#include "tracker-db-manager.h"
 #include "tracker-ontologies.h"
 #include "tracker-sparql-query.h"
 
diff --git a/src/libtracker-data/tracker-data-query.h b/src/libtracker-data/tracker-data-query.h
index 4a16fda..39702ad 100644
--- a/src/libtracker-data/tracker-data-query.h
+++ b/src/libtracker-data/tracker-data-query.h
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <libtracker-db/tracker-db-interface.h>
+#include "tracker-db-interface.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-data/tracker-data-update.c b/src/libtracker-data/tracker-data-update.c
index a2b6077..86971e1 100644
--- a/src/libtracker-data/tracker-data-update.c
+++ b/src/libtracker-data/tracker-data-update.c
@@ -33,14 +33,13 @@
 #include <libtracker-fts/tracker-fts.h>
 #endif
 
-#include <libtracker-db/tracker-db-manager.h>
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-journal.h>
-
 #include "tracker-class.h"
 #include "tracker-data-manager.h"
 #include "tracker-data-update.h"
 #include "tracker-data-query.h"
+#include "tracker-db-manager.h"
+#include "tracker-db-dbus.h"
+#include "tracker-db-journal.h"
 #include "tracker-ontologies.h"
 #include "tracker-property.h"
 #include "tracker-sparql-query.h"
diff --git a/src/libtracker-data/tracker-data-update.h b/src/libtracker-data/tracker-data-update.h
index 11444f9..981a702 100644
--- a/src/libtracker-data/tracker-data-update.h
+++ b/src/libtracker-data/tracker-data-update.h
@@ -25,7 +25,7 @@
 
 #include <libtracker-common/tracker-ontologies.h>
 
-#include <libtracker-db/tracker-db-interface.h>
+#include "tracker-db-interface.h"
 
 G_BEGIN_DECLS
 
diff --git a/src/libtracker-data/tracker-data.h b/src/libtracker-data/tracker-data.h
index 668bb99..84e2f8e 100644
--- a/src/libtracker-data/tracker-data.h
+++ b/src/libtracker-data/tracker-data.h
@@ -31,6 +31,12 @@
 #include "tracker-data-manager.h"
 #include "tracker-data-query.h"
 #include "tracker-data-update.h"
+#include "tracker-db-config.h"
+#include "tracker-db-dbus.h"
+#include "tracker-db-interface.h"
+#include "tracker-db-interface-sqlite.h"
+#include "tracker-db-journal.h"
+#include "tracker-db-manager.h"
 #include "tracker-namespace.h"
 #include "tracker-ontology.h"
 #include "tracker-ontologies.h"
diff --git a/src/libtracker-db/tracker-db-config.c b/src/libtracker-data/tracker-db-config.c
similarity index 100%
rename from src/libtracker-db/tracker-db-config.c
rename to src/libtracker-data/tracker-db-config.c
diff --git a/src/libtracker-db/tracker-db-config.h b/src/libtracker-data/tracker-db-config.h
similarity index 100%
rename from src/libtracker-db/tracker-db-config.h
rename to src/libtracker-data/tracker-db-config.h
diff --git a/src/libtracker-db/tracker-db-dbus.c b/src/libtracker-data/tracker-db-dbus.c
similarity index 100%
rename from src/libtracker-db/tracker-db-dbus.c
rename to src/libtracker-data/tracker-db-dbus.c
diff --git a/src/libtracker-db/tracker-db-dbus.h b/src/libtracker-data/tracker-db-dbus.h
similarity index 90%
rename from src/libtracker-db/tracker-db-dbus.h
rename to src/libtracker-data/tracker-db-dbus.h
index 47c42cc..86d82c3 100644
--- a/src/libtracker-db/tracker-db-dbus.h
+++ b/src/libtracker-data/tracker-db-dbus.h
@@ -27,8 +27,8 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DB_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-db/tracker-db.h> must be included directly."
+#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-data/tracker-data.h> must be included directly."
 #endif
 
 gchar **    tracker_dbus_query_result_to_strv            (TrackerDBResultSet *result_set,
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.c b/src/libtracker-data/tracker-db-interface-sqlite.c
similarity index 100%
rename from src/libtracker-db/tracker-db-interface-sqlite.c
rename to src/libtracker-data/tracker-db-interface-sqlite.c
diff --git a/src/libtracker-db/tracker-db-interface-sqlite.h b/src/libtracker-data/tracker-db-interface-sqlite.h
similarity index 93%
rename from src/libtracker-db/tracker-db-interface-sqlite.h
rename to src/libtracker-data/tracker-db-interface-sqlite.h
index 04cecd0..52a45d2 100644
--- a/src/libtracker-db/tracker-db-interface-sqlite.h
+++ b/src/libtracker-data/tracker-db-interface-sqlite.h
@@ -24,8 +24,8 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DB_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-db/tracker-db.h> must be included directly."
+#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-data/tracker-data.h> must be included directly."
 #endif
 
 typedef gint (* TrackerDBCollationFunc) (gchar *str1,
diff --git a/src/libtracker-db/tracker-db-interface.c b/src/libtracker-data/tracker-db-interface.c
similarity index 100%
rename from src/libtracker-db/tracker-db-interface.c
rename to src/libtracker-data/tracker-db-interface.c
diff --git a/src/libtracker-db/tracker-db-interface.h b/src/libtracker-data/tracker-db-interface.h
similarity index 98%
rename from src/libtracker-db/tracker-db-interface.h
rename to src/libtracker-data/tracker-db-interface.h
index 56a851d..ee5a278 100644
--- a/src/libtracker-db/tracker-db-interface.h
+++ b/src/libtracker-data/tracker-db-interface.h
@@ -24,8 +24,8 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DB_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-db/tracker-db.h> must be included directly."
+#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-data/tracker-data.h> must be included directly."
 #endif
 
 #define TRACKER_TYPE_DB_INTERFACE           (tracker_db_interface_get_type ())
diff --git a/src/libtracker-db/tracker-db-journal.c b/src/libtracker-data/tracker-db-journal.c
similarity index 100%
rename from src/libtracker-db/tracker-db-journal.c
rename to src/libtracker-data/tracker-db-journal.c
diff --git a/src/libtracker-db/tracker-db-journal.h b/src/libtracker-data/tracker-db-journal.h
similarity index 100%
rename from src/libtracker-db/tracker-db-journal.h
rename to src/libtracker-data/tracker-db-journal.h
diff --git a/src/libtracker-db/tracker-db-manager.c b/src/libtracker-data/tracker-db-manager.c
similarity index 100%
rename from src/libtracker-db/tracker-db-manager.c
rename to src/libtracker-data/tracker-db-manager.c
diff --git a/src/libtracker-db/tracker-db-manager.h b/src/libtracker-data/tracker-db-manager.h
similarity index 95%
rename from src/libtracker-db/tracker-db-manager.h
rename to src/libtracker-data/tracker-db-manager.h
index e4dce00..c69b48d 100644
--- a/src/libtracker-db/tracker-db-manager.h
+++ b/src/libtracker-data/tracker-db-manager.h
@@ -26,8 +26,8 @@
 
 G_BEGIN_DECLS
 
-#if !defined (__LIBTRACKER_DB_INSIDE__) && !defined (TRACKER_COMPILATION)
-#error "only <libtracker-db/tracker-db.h> must be included directly."
+#if !defined (__LIBTRACKER_DATA_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-data/tracker-data.h> must be included directly."
 #endif
 
 #define TRACKER_TYPE_DB (tracker_db_get_type ())
diff --git a/src/libtracker-fts/tracker-fts.c b/src/libtracker-fts/tracker-fts.c
index eb34a7b..b0fd382 100644
--- a/src/libtracker-fts/tracker-fts.c
+++ b/src/libtracker-fts/tracker-fts.c
@@ -280,7 +280,7 @@
 #include <sqlite3.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-db/tracker-db-manager.h>
+#include <libtracker-data/tracker-db-manager.h>
 
 #include "tracker-fts.h"
 #include "tracker-fts-config.h"
diff --git a/src/miners/fs/Makefile.am b/src/miners/fs/Makefile.am
index 40fb8e3..c97cc96 100644
--- a/src/miners/fs/Makefile.am
+++ b/src/miners/fs/Makefile.am
@@ -34,7 +34,7 @@ tracker_miner_fs_SOURCES =						\
 tracker_miner_fs_LDADD =						\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(DBUS_LIBS)							\
 	$(GMODULE_LIBS)							\
diff --git a/src/miners/fs/tracker-main.c b/src/miners/fs/tracker-main.c
index 0ed4307..2b6fe83 100644
--- a/src/miners/fs/tracker-main.c
+++ b/src/miners/fs/tracker-main.c
@@ -42,8 +42,8 @@
 
 #include <libtracker-miner/tracker-miner.h>
 
-#include <libtracker-db/tracker-db-manager.h>
-#include <libtracker-db/tracker-db-dbus.h>
+#include <libtracker-data/tracker-db-manager.h>
+#include <libtracker-data/tracker-db-dbus.h>
 
 #include "tracker-config.h"
 #include "tracker-dbus.h"
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 9fbbd86..3c6b5fb 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -42,7 +42,7 @@
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-utils.h>
 
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 
 #include "tracker-miner-files.h"
 #include "tracker-config.h"
diff --git a/src/plugins/kmail/Makefile.am b/src/plugins/kmail/Makefile.am
index f96e59e..0362bc8 100644
--- a/src/plugins/kmail/Makefile.am
+++ b/src/plugins/kmail/Makefile.am
@@ -28,7 +28,7 @@ libtracker_module_kmail_daemon_module_la_LDFLAGS = $(module_flags)
 libtracker_module_kmail_daemon_module_la_LIBADD = 			\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-data/libtracker-data.la          \
-	$(top_builddir)/src/libtracker-db/libtracker-db.la              \
+	$(top_builddir)/src/libtracker-data/libtracker-data.la              \
 	$(top_builddir)/src/libtracker-common/libtracker-common.la      \
 	$(GMODULE_LIBS)							\
 	$(DBUS_LIBS)                                                    \
diff --git a/src/tracker-control/Makefile.am b/src/tracker-control/Makefile.am
index b3445d5..25e8228 100644
--- a/src/tracker-control/Makefile.am
+++ b/src/tracker-control/Makefile.am
@@ -17,7 +17,7 @@ INCLUDES =								\
 libs = 									\
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
-	$(top_builddir)/src/libtracker-db/libtracker-db.la		\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(DBUS_LIBS)							\
 	$(GIO_LIBS)							\
diff --git a/src/tracker-control/tracker-control.c b/src/tracker-control/tracker-control.c
index 35fae5b..3efe871 100644
--- a/src/tracker-control/tracker-control.c
+++ b/src/tracker-control/tracker-control.c
@@ -33,7 +33,7 @@
 #include <glib/gstdio.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 #include <libtracker-miner/tracker-miner.h>
 
 #include "tracker-miner-files-reindex-client.h"
diff --git a/src/tracker-store/Makefile.am b/src/tracker-store/Makefile.am
index e966eba..e1330e4 100644
--- a/src/tracker-store/Makefile.am
+++ b/src/tracker-store/Makefile.am
@@ -67,7 +67,6 @@ endif
 tracker_store_LDADD =							\
 	$(plugin_libs)							\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la		\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(SQLITE3_LIBS)							\
 	$(DBUS_LIBS)							\
diff --git a/src/tracker-store/tracker-dbus.c b/src/tracker-store/tracker-dbus.c
index 13beb71..93d757b 100644
--- a/src/tracker-store/tracker-dbus.c
+++ b/src/tracker-store/tracker-dbus.c
@@ -25,10 +25,9 @@
 #include <libtracker-common/tracker-utils.h>
 #include <libtracker-common/tracker-ontologies.h>
 
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-manager.h>
-
 #include <libtracker-data/tracker-data.h>
+#include <libtracker-data/tracker-db-dbus.h>
+#include <libtracker-data/tracker-db-manager.h>
 
 #include "tracker-dbus.h"
 #include "tracker-resources.h"
diff --git a/src/tracker-store/tracker-main.c b/src/tracker-store/tracker-main.c
index 507c872..177b38c 100644
--- a/src/tracker-store/tracker-main.c
+++ b/src/tracker-store/tracker-main.c
@@ -42,14 +42,12 @@
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-ontologies.h>
 
-#include <libtracker-db/tracker-db-manager.h>
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-config.h>
-#include <libtracker-db/tracker-db-journal.h>
-
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-backup.h>
 #include <libtracker-data/tracker-data-query.h>
+#include <libtracker-data/tracker-db-config.h>
+#include <libtracker-data/tracker-db-dbus.h>
+#include <libtracker-data/tracker-db-manager.h>
 
 #include "tracker-dbus.h"
 #include "tracker-config.h"
diff --git a/src/tracker-store/tracker-resource-class.c b/src/tracker-store/tracker-resource-class.c
index d9c969a..3b2e730 100644
--- a/src/tracker-store/tracker-resource-class.c
+++ b/src/tracker-store/tracker-resource-class.c
@@ -27,9 +27,8 @@
 #include <libtracker-common/tracker-dbus.h>
 #include <libtracker-common/tracker-ontologies.h>
 
-#include <libtracker-db/tracker-db-dbus.h>
-
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-db-dbus.h>
 
 #include "tracker-dbus.h"
 #include "tracker-events.h"
diff --git a/src/tracker-store/tracker-resources.c b/src/tracker-store/tracker-resources.c
index 7a25faf..4a3d346 100644
--- a/src/tracker-store/tracker-resources.c
+++ b/src/tracker-store/tracker-resources.c
@@ -29,11 +29,10 @@
 #include <libtracker-common/tracker-type-utils.h>
 #include <libtracker-common/tracker-ontologies.h>
 
-#include <libtracker-db/tracker-db-dbus.h>
-
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-db-dbus.h>
 
 #include "tracker-dbus.h"
 #include "tracker-marshal.h"
diff --git a/src/tracker-store/tracker-statistics.c b/src/tracker-store/tracker-statistics.c
index 7918669..0829e90 100644
--- a/src/tracker-store/tracker-statistics.c
+++ b/src/tracker-store/tracker-statistics.c
@@ -27,10 +27,9 @@
 #include <libtracker-common/tracker-log.h>
 #include <libtracker-common/tracker-dbus.h>
 
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-manager.h>
-
 #include <libtracker-data/tracker-data.h>
+#include <libtracker-data/tracker-db-dbus.h>
+#include <libtracker-data/tracker-db-manager.h>
 
 #include "tracker-dbus.h"
 #include "tracker-marshal.h"
diff --git a/src/tracker-store/tracker-store.c b/src/tracker-store/tracker-store.c
index 8123b74..8f3150c 100644
--- a/src/tracker-store/tracker-store.c
+++ b/src/tracker-store/tracker-store.c
@@ -29,12 +29,12 @@
 #include <sys/types.h>
 
 #include <libtracker-common/tracker-dbus.h>
-#include <libtracker-db/tracker-db-dbus.h>
-#include <libtracker-db/tracker-db-interface-sqlite.h>
 
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-update.h>
 #include <libtracker-data/tracker-data-query.h>
+#include <libtracker-data/tracker-db-dbus.h>
+#include <libtracker-data/tracker-db-interface-sqlite.h>
 #include <libtracker-data/tracker-sparql-query.h>
 
 #include "tracker-store.h"
diff --git a/src/tracker-store/tracker-store.h b/src/tracker-store/tracker-store.h
index 7da2173..d6a29f0 100644
--- a/src/tracker-store/tracker-store.h
+++ b/src/tracker-store/tracker-store.h
@@ -25,7 +25,7 @@
 #include <stdio.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-db/tracker-db-interface.h>
+#include <libtracker-data/tracker-db-interface.h>
 
 G_BEGIN_DECLS
 
diff --git a/src/tracker-utils/Makefile.am b/src/tracker-utils/Makefile.am
index dab2ab6..0a090cd 100644
--- a/src/tracker-utils/Makefile.am
+++ b/src/tracker-utils/Makefile.am
@@ -17,7 +17,6 @@ INCLUDES =								\
 libs = 									\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/src/libtracker-miner/libtracker-miner- TRACKER_API_VERSION@.la	\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
 	$(DBUS_LIBS)							\
 	$(GIO_LIBS)							\
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7865832..b8a1cb6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -7,7 +7,6 @@ SUBDIRS = 			\
 	libtracker-extract	\
 	libtracker-miner	\
 	libtracker-data		\
-	libtracker-db 		\
 	tracker-miner-fs	\
 	tracker-extract		\
 	tracker-steroids	\
diff --git a/tests/libtracker-data/Makefile.am b/tests/libtracker-data/Makefile.am
index 2b355d9..6ad95e6 100644
--- a/tests/libtracker-data/Makefile.am
+++ b/tests/libtracker-data/Makefile.am
@@ -50,7 +50,6 @@ INCLUDES = 								\
 
 common_ldadd =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la	 	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la	 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(GCOV_LIBS)							\
diff --git a/tests/libtracker-data/tracker-backup-test.c b/tests/libtracker-data/tracker-backup-test.c
index a6acb8a..cca86a0 100644
--- a/tests/libtracker-data/tracker-backup-test.c
+++ b/tests/libtracker-data/tracker-backup-test.c
@@ -25,13 +25,13 @@
 #include <gio/gio.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-db/tracker-db.h>
 
+#include <libtracker-data/tracker-data-backup.h>
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-data.h>
 #include <libtracker-data/tracker-sparql-query.h>
-#include <libtracker-data/tracker-data-backup.h>
 
 static gint backup_calls = 0;
 static GMainLoop *loop = NULL;
diff --git a/tests/libtracker-data/tracker-ontology-change-test.c b/tests/libtracker-data/tracker-ontology-change-test.c
index def104c..5893589 100644
--- a/tests/libtracker-data/tracker-ontology-change-test.c
+++ b/tests/libtracker-data/tracker-ontology-change-test.c
@@ -28,12 +28,7 @@
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 
-#include <libtracker-db/tracker-db.h>
-
-#include <libtracker-data/tracker-data-manager.h>
-#include <libtracker-data/tracker-data-query.h>
-#include <libtracker-data/tracker-data-update.h>
-#include <libtracker-data/tracker-sparql-query.h>
+#include <libtracker-data/tracker-data.h>
 
 typedef struct _TestInfo TestInfo;
 
diff --git a/tests/libtracker-data/tracker-ontology-test.c b/tests/libtracker-data/tracker-ontology-test.c
index 855fcd9..f7e658c 100644
--- a/tests/libtracker-data/tracker-ontology-test.c
+++ b/tests/libtracker-data/tracker-ontology-test.c
@@ -25,11 +25,10 @@
 #include <gio/gio.h>
 #include <glib/gstdio.h>
 
-#include <libtracker-db/tracker-db.h>
-
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-data.h>
 #include <libtracker-data/tracker-sparql-query.h>
 
 typedef struct _TestInfo TestInfo;
diff --git a/tests/libtracker-data/tracker-sparql-blank-test.c b/tests/libtracker-data/tracker-sparql-blank-test.c
index 8340a21..8d614a2 100644
--- a/tests/libtracker-data/tracker-sparql-blank-test.c
+++ b/tests/libtracker-data/tracker-sparql-blank-test.c
@@ -24,11 +24,10 @@
 #include <glib.h>
 #include <gio/gio.h>
 
-#include <libtracker-db/tracker-db.h>
-
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-data.h>
 #include <libtracker-data/tracker-sparql-query.h>
 
 static void
diff --git a/tests/libtracker-data/tracker-sparql-test.c b/tests/libtracker-data/tracker-sparql-test.c
index 44243c2..86e4e03 100644
--- a/tests/libtracker-data/tracker-sparql-test.c
+++ b/tests/libtracker-data/tracker-sparql-test.c
@@ -25,11 +25,11 @@
 #include <gio/gio.h>
 
 #include <libtracker-common/tracker-common.h>
-#include <libtracker-db/tracker-db.h>
 
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-data.h>
 #include <libtracker-data/tracker-sparql-query.h>
 
 typedef struct _TestInfo TestInfo;
diff --git a/tests/libtracker-db/Makefile.am b/tests/libtracker-db/Makefile.am
index acc6441..94a457f 100644
--- a/tests/libtracker-db/Makefile.am
+++ b/tests/libtracker-db/Makefile.am
@@ -43,7 +43,7 @@ tracker_db_journal_SOURCES = 						\
 	tracker-db-journal.c
 
 tracker_db_journal_LDADD =						\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(SQLITE3_LIBS)							\
@@ -57,7 +57,7 @@ tracker_db_dbus_SOURCES = 						\
 
 tracker_db_dbus_LDADD =						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(SQLITE3_LIBS)							\
 	$(GMODULE_LIBS)							\
@@ -72,7 +72,7 @@ tracker_db_dbus_LDADD =						\
 # 	tracker-db-manager-common.h
 #
 # tracker_db_manager_attach_LDADD =					\
-# 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+# 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 # 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 # 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 # 	$(SQLITE3_LIBS)							\
@@ -87,7 +87,7 @@ tracker_db_dbus_LDADD =						\
 # 	tracker-db-manager-common.h
 #
 # tracker_db_manager_unattach_LDADD =					\
-# 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+# 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 # 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 # 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 # 	$(SQLITE3_LIBS)							\
@@ -102,7 +102,7 @@ tracker_db_dbus_LDADD =						\
 # 	tracker-db-manager-common.h
 #
 # tracker_db_manager_custom_LDADD =					\
-# 	$(top_builddir)/src/libtracker-db/libtracker-db.la 		\
+# 	$(top_builddir)/src/libtracker-data/libtracker-data.la 		\
 # 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
 # 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 # 	$(SQLITE3_LIBS)							\
diff --git a/tests/libtracker-db/tracker-db-dbus-test.c b/tests/libtracker-db/tracker-db-dbus-test.c
index a740782..e5ecfde 100644
--- a/tests/libtracker-db/tracker-db-dbus-test.c
+++ b/tests/libtracker-db/tracker-db-dbus-test.c
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 
 #include "tracker-test-helpers.h"
 
diff --git a/tests/libtracker-db/tracker-db-journal.c b/tests/libtracker-db/tracker-db-journal.c
index b2631a0..02ef306 100644
--- a/tests/libtracker-db/tracker-db-journal.c
+++ b/tests/libtracker-db/tracker-db-journal.c
@@ -21,7 +21,7 @@
 
 #include <libtracker-common/tracker-crc32.h>
 
-#include <libtracker-db/tracker-db-journal.h>
+#include <libtracker-data/tracker-db-journal.h>
 
 static void
 test_init_and_shutdown (void)
diff --git a/tests/libtracker-db/tracker-db-manager-common.h b/tests/libtracker-db/tracker-db-manager-common.h
index d4a9fec..95bc203 100644
--- a/tests/libtracker-db/tracker-db-manager-common.h
+++ b/tests/libtracker-db/tracker-db-manager-common.h
@@ -22,7 +22,7 @@
 
 #include <glib.h>
 
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 
 gboolean test_assert_query_run (TrackerDB db, const gchar *query);
 gboolean test_assert_query_run_on_iface (TrackerDBInterface *iface, const gchar *query);
diff --git a/tests/libtracker-db/tracker-db-manager-test-attach.c b/tests/libtracker-db/tracker-db-manager-test-attach.c
index 9a29bab..11c777b 100644
--- a/tests/libtracker-db/tracker-db-manager-test-attach.c
+++ b/tests/libtracker-db/tracker-db-manager-test-attach.c
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 
 #include "tracker-db-manager-common.h"
 
diff --git a/tests/libtracker-db/tracker-db-manager-test-custom.c b/tests/libtracker-db/tracker-db-manager-test-custom.c
index a1cea73..16a9abc 100644
--- a/tests/libtracker-db/tracker-db-manager-test-custom.c
+++ b/tests/libtracker-db/tracker-db-manager-test-custom.c
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 
 #include "tracker-db-manager-common.h"
 
diff --git a/tests/libtracker-db/tracker-db-manager-test-unattach.c b/tests/libtracker-db/tracker-db-manager-test-unattach.c
index 1182e98..9acef09 100644
--- a/tests/libtracker-db/tracker-db-manager-test-unattach.c
+++ b/tests/libtracker-db/tracker-db-manager-test-unattach.c
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 
-#include <libtracker-db/tracker-db.h>
+#include <libtracker-data/tracker-data.h>
 
 #include "tracker-db-manager-common.h"
 
diff --git a/tests/libtracker-fts/Makefile.am b/tests/libtracker-fts/Makefile.am
index ea5c17e..e61147f 100644
--- a/tests/libtracker-fts/Makefile.am
+++ b/tests/libtracker-fts/Makefile.am
@@ -32,7 +32,6 @@ INCLUDES = 								\
 
 common_ldadd =								\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 	\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la	 	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la	 	\
 	$(top_builddir)/tests/common/libtracker-testcommon.la 		\
 	$(GCOV_LIBS)							\
diff --git a/tests/libtracker-fts/tracker-fts-test.c b/tests/libtracker-fts/tracker-fts-test.c
index 8cc5a9e..6058822 100644
--- a/tests/libtracker-fts/tracker-fts-test.c
+++ b/tests/libtracker-fts/tracker-fts-test.c
@@ -26,11 +26,10 @@
 
 #include <libtracker-common/tracker-ontologies.h>
 
-#include <libtracker-db/tracker-db.h>
-
 #include <libtracker-data/tracker-data-manager.h>
 #include <libtracker-data/tracker-data-query.h>
 #include <libtracker-data/tracker-data-update.h>
+#include <libtracker-data/tracker-data.h>
 #include <libtracker-data/tracker-sparql-query.h>
 
 typedef struct _TestInfo TestInfo;
diff --git a/tests/tracker-miner-fs/Makefile.am b/tests/tracker-miner-fs/Makefile.am
index b5f4a89..e4f80c0 100644
--- a/tests/tracker-miner-fs/Makefile.am
+++ b/tests/tracker-miner-fs/Makefile.am
@@ -28,7 +28,6 @@ tracker_metadata_utils_SOURCES = 						\
 
 tracker_metadata_utils_LDADD =	                                        	\
 	$(top_builddir)/src/libtracker-data/libtracker-data.la 			\
-	$(top_builddir)/src/libtracker-db/libtracker-db.la 			\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la 		\
 	$(top_builddir)/src/libtracker-client/libtracker-client- TRACKER_API_VERSION@.la \
 	$(top_builddir)/tests/common/libtracker-testcommon.la           	\
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]