zeitgeist team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 330
committer: Siegfried-Angel Gevatter Pujals <siegfried@xxxxxxxxxxxx>
branch nick: bluebird
timestamp: Tue 2011-11-01 19:12:14 +0100
message:
  Binary: zeitgeist -> zeitgeist-daemon
modified:
  .bzrignore
  Makefile.am
  extra/org.gnome.zeitgeist.service.in
  src/Makefile.am
  test/dbus/run-all-tests.py
  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:28:09 +0000
+++ .bzrignore	2011-11-01 18:12:14 +0000
@@ -53,3 +53,4 @@
 py-compile
 extra/python/_ontology.py
 test/direct/*.c
+src/zeitgeist-daemon

=== modified file 'Makefile.am'
--- Makefile.am	2011-10-31 15:28:09 +0000
+++ Makefile.am	2011-11-01 18:12:14 +0000
@@ -36,10 +36,10 @@
 	$(NULL)
 
 run: all
-	./src/zeitgeist
+	./src/zeitgeist-daemon
 
 debug: all
-	gdb ./src/zeitgeist
+	gdb ./src/zeitgeist-daemon
 
 test-dbus: all
 	./test/dbus/run-all-tests.py

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

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2011-10-31 15:28:09 +0000
+++ src/Makefile.am	2011-11-01 18:12:14 +0000
@@ -1,6 +1,6 @@
 NULL = 
 
-bin_PROGRAMS = zeitgeist
+bin_PROGRAMS = zeitgeist-daemon
 
 AM_CPPFLAGS = \
 	$(ZEITGEIST_CFLAGS) \
@@ -27,7 +27,7 @@
 	ext-fts.vala \
 	$(NULL)
 
-zeitgeist_VALASOURCES = \
+zeitgeist_daemon_VALASOURCES = \
 	zeitgeist-daemon.vala \
 	datamodel.vala \
 	engine.vala \
@@ -46,17 +46,17 @@
 	ontology-uris.vala \
 	$(NULL)
 
-zeitgeist_SOURCES = \
+zeitgeist_daemon_SOURCES = \
 	zeitgeist-engine_vala.stamp \
-	$(zeitgeist_VALASOURCES:.vala=.c) \
+	$(zeitgeist_daemon_VALASOURCES:.vala=.c) \
 	$(extensions_VALASOURCES:.vala=.c) \
 	$(NULL)
 
-zeitgeist_LDADD = \
+zeitgeist_daemon_LDADD = \
 	$(ZEITGEIST_LIBS) \
 	$(NULL)
 
-zeitgeist_LDFLAGS = -export-dynamic -no-undefined
+zeitgeist_daemon_LDFLAGS = -export-dynamic -no-undefined
 
 BUILT_SOURCES = zeitgeist-engine_vala.stamp extensions_vala.stamp
 
@@ -77,7 +77,7 @@
 ontology.vala ontology-uris.vala: ontology_vala.stamp
 
 EXTRA_DIST = \
-	$(zeitgeist_VALASOURCES) \
+	$(zeitgeist_daemon_VALASOURCES) \
 	$(extensions_VALASOURCES) \
 	ontology_vala.stamp \
 	ontology.vala.in \

=== modified file 'test/dbus/run-all-tests.py'
--- test/dbus/run-all-tests.py	2011-08-18 12:53:02 +0000
+++ test/dbus/run-all-tests.py	2011-11-01 18:12:14 +0000
@@ -89,6 +89,7 @@
 	err = bus.run(ignore_errors=True)
 	if err:
 		print >> sys.stderr, "*** Failed to setup private bus, error was: %s" %err
+		raise SystemExit
 	else:
 		print >> sys.stderr, "*** Testsuite is running using a private dbus bus"
 		config = bus.dbus_config.copy()

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