summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiegfried-Angel Gevatter Pujals <rainct@ubuntu.com>2010-09-26 21:14:36 +0200
committerSiegfried-Angel Gevatter Pujals <rainct@ubuntu.com>2010-09-26 21:14:36 +0200
commitefb94b7a91b574d7108e2036389cc61949e9c404 (patch)
treec30a4356f529255c50a1fbe206feb521d3c3f068
parentc89195d5c04a9b35453742a41480a68d22a1edb7 (diff)
parent03219fc451319bd8fb5409a073daba42cb49608d (diff)
downloadzeitgeist-0.5.tar.gz
Merge in last changes from 0.5.2.v0.5.20.5
-rw-r--r--NEWS4
-rw-r--r--VERSION2
-rw-r--r--_zeitgeist/engine/remote.py2
-rw-r--r--configure.ac2
4 files changed, 5 insertions, 5 deletions
diff --git a/NEWS b/NEWS
index 6f9ef1ee..9baa5176 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-2010-09-25: Zeitgeist 0.5.1 "Snowball Effect"
+2010-09-26: Zeitgeist 0.5.2 "Snowball Effect"
---------------------------------------------
Engine:
@@ -9,7 +9,7 @@ Engine:
can be used to signal a system-wide restart request after an update.
- Fixed a bug in TableLookup because of which the internal cache wasn't
being used.
- - Added a new option, activated by the ZEITGEIST_DEBUG_QUEYR_PLANS, which
+ - Added a new option, activated by the ZEITGEIST_DEBUG_QUERY_PLANS, which
prints detailed information about each query being executed.
- Removed superfluous database commits; now they are called after all
InsertEvent actions have been completed, not once for every event.
diff --git a/VERSION b/VERSION
index 8f0916f7..cb0c939a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.0
+0.5.2
diff --git a/_zeitgeist/engine/remote.py b/_zeitgeist/engine/remote.py
index 10cf19a1..f67cc98e 100644
--- a/_zeitgeist/engine/remote.py
+++ b/_zeitgeist/engine/remote.py
@@ -42,7 +42,7 @@ class RemoteInterface(SingletonApplication):
:const:`org.gnome.zeitgeist.Engine`.
"""
_dbus_properties = {
- "version": property(lambda self: (0, 5, 1)),
+ "version": property(lambda self: (0, 5, 2)),
}
# Initialization
diff --git a/configure.ac b/configure.ac
index 4166ea8f..ecc254af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([zeitgeist], [0.5.1])
+AC_INIT([zeitgeist], [0.5.2])
AC_CONFIG_SRCDIR(zeitgeist-daemon.py)
AM_INIT_AUTOMAKE([1.9 foreign])
GNOME_COMMON_INIT