------------------------------------------------------------
revno: 329
committer: Siegfried-Angel Gevatter Pujals <siegfr...@gevatter.com>
branch nick: bluebird
timestamp: Mon 2011-10-31 16:28:09 +0100
message:
  It's cold and the birds fly away. But the Zeitgeist won't change.
modified:
  .bzrignore
  Makefile.am
  autogen.sh
  configure.ac
  extensions/Makefile.am
  extensions/fts-python/constants.py
  extra/org.gnome.zeitgeist.service.in
  src/Makefile.am
  src/sql-schema.vala
  src/utils.vala
  test/dbus/testutils.py


--
lp:~zeitgeist/zeitgeist/bluebird
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird

Your team Zeitgeist Framework Team is subscribed to branch 
lp:~zeitgeist/zeitgeist/bluebird.
To unsubscribe from this branch go to 
https://code.launchpad.net/~zeitgeist/zeitgeist/bluebird/+edit-subscription
=== modified file '.bzrignore'
--- .bzrignore	2011-10-31 15:00:28 +0000
+++ .bzrignore	2011-10-31 15:28:09 +0000
@@ -30,6 +30,7 @@
 src/.libs
 src/*.c
 src/*.stamp
+src/zeitgeist
 src/bluebird
 test/direct/where-clause-test
 extra/ontology/*.py

=== modified file 'Makefile.am'
--- Makefile.am	2011-10-31 15:00:28 +0000
+++ Makefile.am	2011-10-31 15:28:09 +0000
@@ -8,8 +8,8 @@
 	po \
 	$(NULL)
 
-bluebirddocdir = ${prefix}/doc/bluebird
-bluebirddoc_DATA = \
+zeitgeistdocdir = ${prefix}/doc/zeitgeist
+zeitgeistdoc_DATA = \
 	AUTHORS \
 	NEWS \
 	$(NULL)
@@ -17,7 +17,7 @@
 DISTCHECK_CONFIGURE_FLAGS = --with-session-bus-services-dir="\$(datadir)"/dbus-1/services
 
 EXTRA_DIST = \
-	$(bluebirddoc_DATA) \
+	$(zeitgeistdoc_DATA) \
 	INSTALL \
 	COPYING \
 	COPYING.GPL \
@@ -36,10 +36,10 @@
 	$(NULL)
 
 run: all
-	./src/bluebird
+	./src/zeitgeist
 
 debug: all
-	gdb ./src/bluebird
+	gdb ./src/zeitgeist
 
 test-dbus: all
 	./test/dbus/run-all-tests.py

=== modified file 'autogen.sh'
--- autogen.sh	2011-07-25 23:24:14 +0000
+++ autogen.sh	2011-10-31 15:28:09 +0000
@@ -4,6 +4,6 @@
 srcdir=`dirname $0`
 test -z "$srcdir" && srcdir=.
 
-PKG_NAME="bluebird"
+PKG_NAME="zeitgeist"
 
 . gnome-autogen.sh

=== modified file 'configure.ac'
--- configure.ac	2011-10-29 14:01:50 +0000
+++ configure.ac	2011-10-31 15:28:09 +0000
@@ -1,4 +1,4 @@
-AC_INIT([bluebird], [0.8.99~alpha1], [d...@lists.zeitgeist-project.com], [bluebird])
+AC_INIT([zeitgeist], [0.8.99~alpha1], [d...@lists.zeitgeist-project.com], [zeitgeist])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS(config.h)
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -16,7 +16,7 @@
 AM_SILENT_RULES([yes])
 
 AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext])
-GETTEXT_PACKAGE=bluebird
+GETTEXT_PACKAGE=zeitgeist
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
 AC_SUBST(GETTEXT_PACKAGE)
 AM_GLIB_GNU_GETTEXT
@@ -29,14 +29,14 @@
 GLIB_REQUIRED=2.26.0
 SQLITE_REQUIRED=3.7
 
-BLUEBIRD_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
-                   gobject-2.0 >= $GLIB_REQUIRED
-                   gio-unix-2.0 >= $GLIB_REQUIRED
-                   sqlite3 >= $SQLITE_REQUIRED"
+ZEITGEIST_REQUIRED="glib-2.0 >= $GLIB_REQUIRED
+                    gobject-2.0 >= $GLIB_REQUIRED
+                    gio-unix-2.0 >= $GLIB_REQUIRED
+                    sqlite3 >= $SQLITE_REQUIRED"
 
-PKG_CHECK_MODULES(BLUEBIRD, [$BLUEBIRD_REQUIRED])
-AC_SUBST(BLUEBIRD_CFLAGS)
-AC_SUBST(BLUEBIRD_LIBS)
+PKG_CHECK_MODULES(ZEITGEIST, [$ZEITGEIST_REQUIRED])
+AC_SUBST(ZEITGEIST_CFLAGS)
+AC_SUBST(ZEITGEIST_LIBS)
 
 #################################################
 # DBus service

=== modified file 'extensions/Makefile.am'
--- extensions/Makefile.am	2011-10-10 14:07:42 +0000
+++ extensions/Makefile.am	2011-10-31 15:28:09 +0000
@@ -6,7 +6,7 @@
 noinst_LTLIBRARIES = ds-registry.la blacklist.la storage-monitor.la fts.la
 
 AM_CPPFLAGS = \
-	$(BLUEBIRD_CFLAGS) \
+	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-I $(top_srcdir)/src \
 	-w \
@@ -27,7 +27,7 @@
 ds_registry_la_LDFLAGS = -module -avoid-version
 
 ds_registry_la_LIBADD = \
-	$(BLUEBIRD_LIBS) \
+	$(ZEITGEIST_LIBS) \
 	$(NULL)
 
 blacklist_la_SOURCES = \
@@ -37,7 +37,7 @@
 blacklist_la_LDFLAGS = -module -avoid-version
 
 blacklist_la_LIBADD = \
-	$(BLUEBIRD_LIBS) \
+	$(ZEITGEIST_LIBS) \
 	$(NULL)
 
 storage_monitor_la_SOURCES = \
@@ -47,7 +47,7 @@
 storage_monitor_la_LDFLAGS = -module -avoid-version
 
 storage_monitor_la_LIBADD = \
-	$(BLUEBIRD_LIBS) \
+	$(ZEITGEIST_LIBS) \
 	$(NULL)
 	
 
@@ -58,5 +58,5 @@
 fts_la_LDFLAGS = -module -avoid-version
 
 fts_la_LIBADD = \
-	$(BLUEBIRD_LIBS) \
+	$(ZEITGEIST_LIBS) \
 	$(NULL)

=== modified file 'extensions/fts-python/constants.py'
--- extensions/fts-python/constants.py	2011-10-10 14:44:49 +0000
+++ extensions/fts-python/constants.py	2011-10-31 15:28:09 +0000
@@ -45,7 +45,7 @@
 class _Constants:
 	# Directories
 	DATA_PATH = os.environ.get("ZEITGEIST_DATA_PATH",
-		BaseDirectory.save_data_path("bluebird"))
+		BaseDirectory.save_data_path("zeitgeist"))
 	DATABASE_FILE = os.environ.get("ZEITGEIST_DATABASE_PATH",
 		os.path.join(DATA_PATH, "activity.sqlite"))
 	DATABASE_FILE_BACKUP = os.environ.get("ZEITGEIST_DATABASE_BACKUP_PATH",

=== modified file 'extra/org.gnome.zeitgeist.service.in'
--- extra/org.gnome.zeitgeist.service.in	2011-10-10 14:07:42 +0000
+++ extra/org.gnome.zeitgeist.service.in	2011-10-31 15:28:09 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.gnome.zeitgeist.Engine
-Exec=@prefix@/bin/bluebird
+Exec=@prefix@/bin/zeitgeist

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-10-09 10:42:33 +0000
+++ src/Makefile.am	2011-10-31 15:28:09 +0000
@@ -1,9 +1,9 @@
 NULL = 
 
-bin_PROGRAMS = bluebird
+bin_PROGRAMS = zeitgeist
 
 AM_CPPFLAGS = \
-	$(BLUEBIRD_CFLAGS) \
+	$(ZEITGEIST_CFLAGS) \
 	-include $(CONFIG_HEADER) \
 	-w \
 	$(NULL)
@@ -27,7 +27,7 @@
 	ext-fts.vala \
 	$(NULL)
 
-bluebird_VALASOURCES = \
+zeitgeist_VALASOURCES = \
 	zeitgeist-daemon.vala \
 	datamodel.vala \
 	engine.vala \
@@ -46,21 +46,21 @@
 	ontology-uris.vala \
 	$(NULL)
 
-bluebird_SOURCES = \
+zeitgeist_SOURCES = \
 	zeitgeist-engine_vala.stamp \
-	$(bluebird_VALASOURCES:.vala=.c) \
+	$(zeitgeist_VALASOURCES:.vala=.c) \
 	$(extensions_VALASOURCES:.vala=.c) \
 	$(NULL)
 
-bluebird_LDADD = \
-	$(BLUEBIRD_LIBS) \
+zeitgeist_LDADD = \
+	$(ZEITGEIST_LIBS) \
 	$(NULL)
 
-bluebird_LDFLAGS = -export-dynamic -no-undefined
+zeitgeist_LDFLAGS = -export-dynamic -no-undefined
 
 BUILT_SOURCES = zeitgeist-engine_vala.stamp extensions_vala.stamp
 
-zeitgeist-engine_vala.stamp: $(bluebird_VALASOURCES)
+zeitgeist-engine_vala.stamp: $(zeitgeist_VALASOURCES)
 	$(VALA_V)$(VALAC) $(VALAFLAGS) -C -H zeitgeist-engine.h --library zeitgeist-engine $^
 	@touch "$@"
 
@@ -77,7 +77,7 @@
 ontology.vala ontology-uris.vala: ontology_vala.stamp
 
 EXTRA_DIST = \
-	$(bluebird_VALASOURCES) \
+	$(zeitgeist_VALASOURCES) \
 	$(extensions_VALASOURCES) \
 	ontology_vala.stamp \
 	ontology.vala.in \

=== modified file 'src/sql-schema.vala'
--- src/sql-schema.vala	2011-10-20 13:55:35 +0000
+++ src/sql-schema.vala	2011-10-31 15:28:09 +0000
@@ -50,7 +50,7 @@
             }
             else if (schema_version == 4)
             {
-                // DB from latest python Zeitgeist, which we can "upgrade"
+                // DB from latest Python Zeitgeist, which we can "upgrade"
                 try
                 {
                   Utils.backup_database ();

=== modified file 'src/utils.vala'
--- src/utils.vala	2011-10-20 13:32:51 +0000
+++ src/utils.vala	2011-10-31 15:28:09 +0000
@@ -31,7 +31,7 @@
         private static string DATABASE_FILE_BACKUP_PATH;
         private static string LOCAL_EXTENSIONS_PATH;
 
-        public const string ZEITGEIST_DATA_FOLDER = "bluebird";
+        public const string ZEITGEIST_DATA_FOLDER = "zeitgeist";
         public const string USER_EXTENSION_PATH = "";
 
         // D-Bus

=== modified file 'test/dbus/testutils.py'
--- test/dbus/testutils.py	2011-09-18 12:54:07 +0000
+++ test/dbus/testutils.py	2011-10-31 15:28:09 +0000
@@ -141,12 +141,12 @@
 		def error_callback(stdout, stderr):
 			if "--replace" in stderr:
 				return "%r | %s" %(stderr, RemoteTestCase._get_pid(
-					"./src/bluebird").replace("\n", "|"))
+					"./src/zeitgeist").replace("\n", "|"))
 			else:
 				return stderr
 			
 		return RemoteTestCase._safe_start_subprocess(
-			("./src/bluebird", "--no-datahub"), env, timeout, error_callback
+			("./src/zeitgeist", "--no-datahub"), env, timeout, error_callback
 		)
 	
 	def __init__(self, methodName):

_______________________________________________
Mailing list: https://launchpad.net/~zeitgeist
Post to     : zeitgeist@lists.launchpad.net
Unsubscribe : https://launchpad.net/~zeitgeist
More help   : https://help.launchpad.net/ListHelp

Reply via email to