tracker r2357 - in trunk: . data data/db

[mr svn gnome org]

Author: mr
Date: Mon Oct 13 10:49:07 2008
New Revision: 2357
URL: http://svn.gnome.org/viewvc/tracker?rev=2357&view=rev

Log:
	* configure.ac:
	* data/Makefile.am:
	* data/db/Makefile.am:
	* data/sqlite-cache.sql:
	* data/sqlite-contents.sql:
	* data/sqlite-email.sql:
	* data/sqlite-metadata.sql:
	* data/sqlite-service-triggers.sql:
	* data/sqlite-service-types.sql:
	* data/sqlite-service.sql:
	* data/sqlite-stored-procs.sql:
	* data/sqlite-tracker-triggers.sql:
	* data/sqlite-tracker.sql:
	* data/sqlite-user-data.sql:
	* data/sqlite-xesam.sql: Moved all database files to data/db.


Added:
   trunk/data/db/
   trunk/data/db/Makefile.am
   trunk/data/db/sqlite-cache.sql
      - copied unchanged from r2353, /trunk/data/sqlite-cache.sql
   trunk/data/db/sqlite-contents.sql
      - copied unchanged from r2353, /trunk/data/sqlite-contents.sql
   trunk/data/db/sqlite-email.sql
      - copied unchanged from r2353, /trunk/data/sqlite-email.sql
   trunk/data/db/sqlite-metadata.sql
      - copied unchanged from r2353, /trunk/data/sqlite-metadata.sql
   trunk/data/db/sqlite-service-triggers.sql
      - copied unchanged from r2353, /trunk/data/sqlite-service-triggers.sql
   trunk/data/db/sqlite-service-types.sql
      - copied unchanged from r2353, /trunk/data/sqlite-service-types.sql
   trunk/data/db/sqlite-service.sql
      - copied unchanged from r2353, /trunk/data/sqlite-service.sql
   trunk/data/db/sqlite-stored-procs.sql
      - copied unchanged from r2353, /trunk/data/sqlite-stored-procs.sql
   trunk/data/db/sqlite-tracker-triggers.sql
      - copied unchanged from r2353, /trunk/data/sqlite-tracker-triggers.sql
   trunk/data/db/sqlite-tracker.sql
      - copied unchanged from r2353, /trunk/data/sqlite-tracker.sql
   trunk/data/db/sqlite-triggers.sql
      - copied unchanged from r2353, /trunk/data/sqlite-triggers.sql
   trunk/data/db/sqlite-user-data.sql
      - copied unchanged from r2353, /trunk/data/sqlite-user-data.sql
   trunk/data/db/sqlite-xesam.sql
      - copied unchanged from r2353, /trunk/data/sqlite-xesam.sql
Removed:
   trunk/data/sqlite-cache.sql
   trunk/data/sqlite-contents.sql
   trunk/data/sqlite-email.sql
   trunk/data/sqlite-metadata.sql
   trunk/data/sqlite-service-triggers.sql
   trunk/data/sqlite-service-types.sql
   trunk/data/sqlite-service.sql
   trunk/data/sqlite-stored-procs.sql
   trunk/data/sqlite-tracker-triggers.sql
   trunk/data/sqlite-tracker.sql
   trunk/data/sqlite-triggers.sql
   trunk/data/sqlite-user-data.sql
   trunk/data/sqlite-xesam.sql
Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/data/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 13 10:49:07 2008
@@ -1101,6 +1101,7 @@
 ##################################################################
 
 AC_CONFIG_FILES([
+	data/db/Makefile
 	data/dbus/Makefile
 	data/icons/16x16/Makefile
 	data/icons/22x22/Makefile

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Mon Oct 13 10:49:07 2008
@@ -1,6 +1,6 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = dbus modules languages icons services
+SUBDIRS = db dbus modules languages icons services
 
 trackerd.desktop: trackerd.desktop.in
 	@sed -e "s|@libexec[ ]|${libexecdir}|" $< > $@
@@ -20,24 +20,6 @@
 pkgconfig_DATA += libtracker-gtk.pc
 endif
 
-configdir = $(datadir)/tracker
-
-config_DATA =						\
-	sqlite-tracker.sql 				\
-	sqlite-cache.sql 				\
-	sqlite-contents.sql				\
-	sqlite-email.sql				\
-	sqlite-service-triggers.sql 			\
-	sqlite-tracker-triggers.sql 			\
-	sqlite-user-data.sql 				\
-	sqlite-stored-procs.sql 			\
-	sqlite-service.sql				\
-	sqlite-service-types.sql 			\
-	sqlite-metadata.sql 				\
-	sqlite-xesam.sql
-
 CLEANFILES = $(autostart_DATA)
 
-DISTCLEANFILES = $(autostart_in_files)
-
-EXTRA_DIST = $(config_DATA)
+DISTCLEANFILES = $(autostart_in_files)
\ No newline at end of file

Added: trunk/data/db/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/data/db/Makefile.am	Mon Oct 13 10:49:07 2008
@@ -0,0 +1,19 @@
+include $(top_srcdir)/Makefile.decl
+
+configdir = $(datadir)/tracker
+
+config_DATA =				\
+	sqlite-cache.sql 		\
+	sqlite-contents.sql		\
+	sqlite-email.sql		\
+	sqlite-metadata.sql 		\
+	sqlite-service.sql		\
+	sqlite-service-triggers.sql 	\
+	sqlite-service-types.sql 	\
+	sqlite-stored-procs.sql 	\
+	sqlite-tracker.sql 		\
+	sqlite-tracker-triggers.sql 	\
+	sqlite-user-data.sql 		\
+	sqlite-xesam.sql
+
+EXTRA_DIST = $(config_DATA)