=== modified file 'debian/changelog' --- debian/changelog 2017-02-19 17:50:22 +0000 +++ debian/changelog 2017-02-19 19:45:46 +0000 @@ -1,3 +1,18 @@ +zeitgeist (1.0-0ubuntu1) UNRELEASED; urgency=medium + + * New upstream release (LP: #1665902) + * debian/control: + - Drop Build-Depends on intltool + * Drop patches applied in new release + - Give-the-D-Bus-service-files-the-correct-names.patch + - Add-a-systemd-user-service-for-each-D-Bus-session-se.patch + - fix_autocomplete.diff + - fix-test-crash.patch + - thread-default-context.patch + * Refresh patches + + -- Jeremy Bicha Sun, 19 Feb 2017 12:51:08 -0500 + zeitgeist (0.9.16-0.2ubuntu1) zesty; urgency=medium * Sync with Debian. Remaining changes: === modified file 'debian/control' --- debian/control 2017-02-19 17:50:22 +0000 +++ debian/control 2017-02-19 18:32:27 +0000 @@ -8,7 +8,6 @@ dh-python, gobject-introspection (>= 1.30.0), gtk-doc-tools, - intltool (>= 0.35.0), libdee-dev (>= 1.0.2), libgirepository1.0-dev (>= 1.30.0), libglib2.0-dev (>= 2.35.4), === removed file 'debian/patches/Add-a-systemd-user-service-for-each-D-Bus-session-se.patch' --- debian/patches/Add-a-systemd-user-service-for-each-D-Bus-session-se.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/Add-a-systemd-user-service-for-each-D-Bus-session-se.patch 1970-01-01 00:00:00 +0000 @@ -1,133 +0,0 @@ -From: Simon McVittie -Date: Thu, 24 Sep 2015 15:27:59 +0100 -Subject: Add a systemd user service for each D-Bus session service - -This means that, under a systemd user session where dbus-daemon uses -systemd for activation, they will correctly go into their own cgroups -instead of being treated as part of dbus.service. ---- - data/Makefile.am | 8 ++++++++ - data/org.gnome.zeitgeist.Engine.service.in | 1 + - data/zeitgeist.service.in | 7 +++++++ - extensions/fts++/Makefile.am | 8 ++++++++ - extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in | 1 + - extensions/fts++/zeitgeist-fts.service.in | 7 +++++++ - 6 files changed, 32 insertions(+) - create mode 100644 data/zeitgeist.service.in - create mode 100644 extensions/fts++/zeitgeist-fts.service.in - -diff --git a/data/Makefile.am b/data/Makefile.am -index 86d6d19..0694f62 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -7,10 +7,16 @@ SUBDIRS = \ - servicedir = $(DBUS_SERVICES_DIR) - service_DATA = org.gnome.zeitgeist.Engine.service - -+systemd_userdir = $(prefix)/lib/systemd/user -+systemd_user_DATA = zeitgeist.service -+ - org.gnome.zeitgeist.Engine.service: org.gnome.zeitgeist.Engine.service.in - $(AM_V_GEN)sed -e s!\@prefix\@!$(prefix)! < $< > $@ - org.gnome.zeitgeist.Engine.service: Makefile - -+zeitgeist.service: zeitgeist.service.in Makefile -+ $(AM_V_GEN)sed -e s!\@prefix\@!$(prefix)! < $< > $@ -+ - bashcompletiondir = $(datadir)/bash-completion/completions - dist_bashcompletion_DATA = completions/zeitgeist-daemon - -@@ -27,11 +33,13 @@ CLEANFILES = \ - org.gnome.zeitgeist.Engine.service \ - PythonSerializer.pyc \ - zeitgeist-datahub.desktop \ -+ zeitgeist.service \ - $(NULL) - - EXTRA_DIST = \ - org.gnome.zeitgeist.Engine.service.in \ - ontology2code \ -+ zeitgeist.service.in \ - $(xdgautostart_in_files) \ - $(NULL) - -diff --git a/data/org.gnome.zeitgeist.Engine.service.in b/data/org.gnome.zeitgeist.Engine.service.in -index 180116f..be6533a 100644 ---- a/data/org.gnome.zeitgeist.Engine.service.in -+++ b/data/org.gnome.zeitgeist.Engine.service.in -@@ -1,3 +1,4 @@ - [D-BUS Service] - Name=org.gnome.zeitgeist.Engine - Exec=@prefix@/bin/zeitgeist-daemon -+SystemdService=zeitgeist.service -diff --git a/data/zeitgeist.service.in b/data/zeitgeist.service.in -new file mode 100644 -index 0000000..88c3099 ---- /dev/null -+++ b/data/zeitgeist.service.in -@@ -0,0 +1,7 @@ -+[Unit] -+Description=Zeitgeist activity log service -+ -+[Service] -+Type=dbus -+BusName=org.gnome.zeitgeist.Engine -+ExecStart=@prefix@/bin/zeitgeist-daemon -diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am -index c1e68a9..65bb8a1 100644 ---- a/extensions/fts++/Makefile.am -+++ b/extensions/fts++/Makefile.am -@@ -7,10 +7,16 @@ libexec_PROGRAMS = zeitgeist-fts - servicedir = $(DBUS_SERVICES_DIR) - nodist_service_DATA = org.gnome.zeitgeist.SimpleIndexer.service - -+systemd_userdir = $(prefix)/lib/systemd/user -+systemd_user_DATA = zeitgeist-fts.service -+ - org.gnome.zeitgeist.SimpleIndexer.service: org.gnome.zeitgeist.SimpleIndexer.service.in - $(AM_V_GEN)sed -e s!\@libexecdir\@!$(libexecdir)! < $< > $@ - org.gnome.zeitgeist.SimpleIndexer.service: Makefile - -+zeitgeist-fts.service: zeitgeist-fts.service.in Makefile -+ $(AM_V_GEN)sed -e s!\@libexecdir\@!$(libexecdir)! < $< > $@ -+ - AM_CPPFLAGS = \ - $(ZEITGEIST_CFLAGS) \ - $(XAPIAN_CXXFLAGS) \ -@@ -87,12 +93,14 @@ EXTRA_DIST = \ - $(zeitgeist_fts_CSOURCES) \ - org.gnome.zeitgeist.SimpleIndexer.service.in \ - fts.vapi \ -+ zeitgeist-fts.service.in \ - $(NULL) - - CLEANFILES = \ - $(BUILT_SOURCES) \ - $(zeitgeist_fts_VALASOURCES:.vala=.c) \ - org.gnome.zeitgeist.SimpleIndexer.service \ -+ zeitgeist-fts.service \ - $(NULL) - - DISTCLEANFILES = \ -diff --git a/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in -index dff8199..089fc60 100644 ---- a/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in -+++ b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in -@@ -1,3 +1,4 @@ - [D-BUS Service] - Name=org.gnome.zeitgeist.SimpleIndexer - Exec=@libexecdir@/zeitgeist-fts -+SystemdService=zeitgeist-fts.service -diff --git a/extensions/fts++/zeitgeist-fts.service.in b/extensions/fts++/zeitgeist-fts.service.in -new file mode 100644 -index 0000000..93bf8f6 ---- /dev/null -+++ b/extensions/fts++/zeitgeist-fts.service.in -@@ -0,0 +1,7 @@ -+[Unit] -+Description=Zeitgeist full-text search indexer -+ -+[Service] -+Type=dbus -+BusName=org.gnome.zeitgeist.SimpleIndexer -+ExecStart=@libexecdir@/zeitgeist-fts === removed file 'debian/patches/Give-the-D-Bus-service-files-the-correct-names.patch' --- debian/patches/Give-the-D-Bus-service-files-the-correct-names.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/Give-the-D-Bus-service-files-the-correct-names.patch 1970-01-01 00:00:00 +0000 @@ -1,141 +0,0 @@ -From: Simon McVittie -Date: Thu, 24 Sep 2015 15:34:29 +0100 -Subject: Give the D-Bus service files the correct names - -Best-practice is that if you implement a session service whose -well-known name (Name field) is com.example.MyService1, and it -should be service-activatable, then it should install -${datadir}/dbus-1/services/com.example.MyService1.service. -This ensures that two non-conflicting packages cannot provide the -same service name with the same search-path priority (i.e. in the -same directory). - -If there are two session services with the same Name in the same -directory, dbus-daemon will arbitrarily choose one of them, which -is unlikely to be the desired result. ---- - data/Makefile.am | 12 ++++++------ - data/org.gnome.zeitgeist.Engine.service.in | 3 +++ - data/org.gnome.zeitgeist.service.in | 3 --- - extensions/fts++/Makefile.am | 10 +++++----- - .../fts++/org.gnome.zeitgeist.SimpleIndexer.service.in | 3 +++ - extensions/fts++/org.gnome.zeitgeist.fts.service.in | 3 --- - 6 files changed, 17 insertions(+), 17 deletions(-) - create mode 100644 data/org.gnome.zeitgeist.Engine.service.in - delete mode 100644 data/org.gnome.zeitgeist.service.in - create mode 100644 extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in - delete mode 100644 extensions/fts++/org.gnome.zeitgeist.fts.service.in - -diff --git a/data/Makefile.am b/data/Makefile.am -index 1698227..86d6d19 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -5,11 +5,11 @@ SUBDIRS = \ - $(NULL) - - servicedir = $(DBUS_SERVICES_DIR) --service_DATA = org.gnome.zeitgeist.service -+service_DATA = org.gnome.zeitgeist.Engine.service - --org.gnome.zeitgeist.service: org.gnome.zeitgeist.service.in -+org.gnome.zeitgeist.Engine.service: org.gnome.zeitgeist.Engine.service.in - $(AM_V_GEN)sed -e s!\@prefix\@!$(prefix)! < $< > $@ --org.gnome.zeitgeist.service: Makefile -+org.gnome.zeitgeist.Engine.service: Makefile - - bashcompletiondir = $(datadir)/bash-completion/completions - dist_bashcompletion_DATA = completions/zeitgeist-daemon -@@ -24,18 +24,18 @@ endif - @INTLTOOL_DESKTOP_RULE@ - - CLEANFILES = \ -- org.gnome.zeitgeist.service \ -+ org.gnome.zeitgeist.Engine.service \ - PythonSerializer.pyc \ - zeitgeist-datahub.desktop \ - $(NULL) - - EXTRA_DIST = \ -- org.gnome.zeitgeist.service.in \ -+ org.gnome.zeitgeist.Engine.service.in \ - ontology2code \ - $(xdgautostart_in_files) \ - $(NULL) - --all-local: org.gnome.zeitgeist.service -+all-local: org.gnome.zeitgeist.Engine.service - - clean: - rm -rf *.pyc *.~[0-9]~ -diff --git a/data/org.gnome.zeitgeist.Engine.service.in b/data/org.gnome.zeitgeist.Engine.service.in -new file mode 100644 -index 0000000..180116f ---- /dev/null -+++ b/data/org.gnome.zeitgeist.Engine.service.in -@@ -0,0 +1,3 @@ -+[D-BUS Service] -+Name=org.gnome.zeitgeist.Engine -+Exec=@prefix@/bin/zeitgeist-daemon -diff --git a/data/org.gnome.zeitgeist.service.in b/data/org.gnome.zeitgeist.service.in -deleted file mode 100644 -index 180116f..0000000 ---- a/data/org.gnome.zeitgeist.service.in -+++ /dev/null -@@ -1,3 +0,0 @@ --[D-BUS Service] --Name=org.gnome.zeitgeist.Engine --Exec=@prefix@/bin/zeitgeist-daemon -diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am -index 0ebf206..c1e68a9 100644 ---- a/extensions/fts++/Makefile.am -+++ b/extensions/fts++/Makefile.am -@@ -5,11 +5,11 @@ SUBDIRS = test - libexec_PROGRAMS = zeitgeist-fts - - servicedir = $(DBUS_SERVICES_DIR) --nodist_service_DATA = org.gnome.zeitgeist.fts.service -+nodist_service_DATA = org.gnome.zeitgeist.SimpleIndexer.service - --org.gnome.zeitgeist.fts.service: org.gnome.zeitgeist.fts.service.in -+org.gnome.zeitgeist.SimpleIndexer.service: org.gnome.zeitgeist.SimpleIndexer.service.in - $(AM_V_GEN)sed -e s!\@libexecdir\@!$(libexecdir)! < $< > $@ --org.gnome.zeitgeist.fts.service: Makefile -+org.gnome.zeitgeist.SimpleIndexer.service: Makefile - - AM_CPPFLAGS = \ - $(ZEITGEIST_CFLAGS) \ -@@ -85,14 +85,14 @@ zeitgeist-fts_vala.stamp: $(engine_VALASOURCES) $(zeitgeist_fts_VALASOURCES) Mak - EXTRA_DIST = \ - $(zeitgeist_fts_VALASOURCES) \ - $(zeitgeist_fts_CSOURCES) \ -- org.gnome.zeitgeist.fts.service.in \ -+ org.gnome.zeitgeist.SimpleIndexer.service.in \ - fts.vapi \ - $(NULL) - - CLEANFILES = \ - $(BUILT_SOURCES) \ - $(zeitgeist_fts_VALASOURCES:.vala=.c) \ -- org.gnome.zeitgeist.fts.service \ -+ org.gnome.zeitgeist.SimpleIndexer.service \ - $(NULL) - - DISTCLEANFILES = \ -diff --git a/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in -new file mode 100644 -index 0000000..dff8199 ---- /dev/null -+++ b/extensions/fts++/org.gnome.zeitgeist.SimpleIndexer.service.in -@@ -0,0 +1,3 @@ -+[D-BUS Service] -+Name=org.gnome.zeitgeist.SimpleIndexer -+Exec=@libexecdir@/zeitgeist-fts -diff --git a/extensions/fts++/org.gnome.zeitgeist.fts.service.in b/extensions/fts++/org.gnome.zeitgeist.fts.service.in -deleted file mode 100644 -index dff8199..0000000 ---- a/extensions/fts++/org.gnome.zeitgeist.fts.service.in -+++ /dev/null -@@ -1,3 +0,0 @@ --[D-BUS Service] --Name=org.gnome.zeitgeist.SimpleIndexer --Exec=@libexecdir@/zeitgeist-fts === modified file 'debian/patches/add_datahub_autostart_delay.patch' --- debian/patches/add_datahub_autostart_delay.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/add_datahub_autostart_delay.patch 2017-02-19 18:50:36 +0000 @@ -1,9 +1,11 @@ -Index: b/data/zeitgeist-datahub.desktop.in -=================================================================== +--- + data/zeitgeist-datahub.desktop.in | 1 + + 1 file changed, 1 insertion(+) + --- a/data/zeitgeist-datahub.desktop.in +++ b/data/zeitgeist-datahub.desktop.in -@@ -8,3 +8,4 @@ +@@ -4,3 +4,4 @@ Comment=Start the Zeitgeist Datahub for + Exec=zeitgeist-datahub + Terminal=false Type=Application - Categories= - GenericName= +X-GNOME-Autostart-Delay=20 === removed file 'debian/patches/fix-test-crash.patch' --- debian/patches/fix-test-crash.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/fix-test-crash.patch 1970-01-01 00:00:00 +0000 @@ -1,200 +0,0 @@ -From 934cead2e3545e823aecac871974b28131d055e6 Mon Sep 17 00:00:00 2001 -From: Robert Ancell -Date: Fri, 24 Jul 2015 16:14:11 +1200 -Subject: [PATCH] Fix tests crashing with GCC 5.1 - -The tests were using a c_str() result from a std::string that had gone out of -scope. GCC 5.1 seems to be more agressive in freeing the string data before -the tests checked against it. - -https://bugs.freedesktop.org/show_bug.cgi?id=91443 ---- - extensions/fts++/test/test-stringutils.cpp | 138 +++++++++++++++++++---------- - 1 file changed, 91 insertions(+), 47 deletions(-) - -diff --git a/extensions/fts++/test/test-stringutils.cpp b/extensions/fts++/test/test-stringutils.cpp -index 7bb34fe..98c868e 100644 ---- a/extensions/fts++/test/test-stringutils.cpp -+++ b/extensions/fts++/test/test-stringutils.cpp -@@ -45,42 +45,66 @@ teardown (Fixture *fix, gconstpointer data) - static void - test_truncate (Fixture *fix, gconstpointer data) - { -- g_assert_cmpstr ("", ==, StringUtils::Truncate("").c_str ()); -- -- g_assert_cmpstr ("", ==, StringUtils::Truncate("a", 0).c_str ()); -- g_assert_cmpstr ("a", ==, StringUtils::Truncate("a", 1).c_str ()); -- g_assert_cmpstr ("a", ==, StringUtils::Truncate("a").c_str ()); -- -- g_assert_cmpstr ("", ==, StringUtils::Truncate("aa", 0).c_str ()); -- g_assert_cmpstr ("a", ==, StringUtils::Truncate("aa", 1).c_str ()); -- g_assert_cmpstr ("aa", ==, StringUtils::Truncate("aa", 2).c_str ()); -- g_assert_cmpstr ("aa", ==, StringUtils::Truncate("aa").c_str ()); -- -- -- g_assert_cmpstr ("", ==, StringUtils::Truncate("å", 0).c_str ()); -- g_assert_cmpstr ("", ==, StringUtils::Truncate("å", 1).c_str ()); -- g_assert_cmpstr ("å", ==, StringUtils::Truncate("å").c_str ()); -- -- g_assert_cmpstr ("", ==, StringUtils::Truncate("åå", 0).c_str ()); -- g_assert_cmpstr ("", ==, StringUtils::Truncate("åå", 1).c_str ()); -- g_assert_cmpstr ("å", ==, StringUtils::Truncate("åå", 2).c_str ()); -- g_assert_cmpstr ("å", ==, StringUtils::Truncate("åå", 3).c_str ()); -- g_assert_cmpstr ("åå", ==, StringUtils::Truncate("åå", 4).c_str ()); -- g_assert_cmpstr ("åå", ==, StringUtils::Truncate("åå").c_str ()); -+ std::string truncated; -+ -+ truncated = StringUtils::Truncate(""); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ -+ truncated = StringUtils::Truncate("a", 0); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("a", 1); -+ g_assert_cmpstr ("a", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("a"); -+ g_assert_cmpstr ("a", ==, truncated.c_str ()); -+ -+ truncated = StringUtils::Truncate("aa", 0); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("aa", 1); -+ g_assert_cmpstr ("a", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("aa", 2); -+ g_assert_cmpstr ("aa", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("aa"); -+ g_assert_cmpstr ("aa", ==, truncated.c_str ()); -+ -+ -+ truncated = StringUtils::Truncate("å", 0); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("å", 1); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("å"); -+ g_assert_cmpstr ("å", ==, truncated.c_str ()); -+ -+ truncated = StringUtils::Truncate("åå", 0); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("åå", 1); -+ g_assert_cmpstr ("", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("åå", 2); -+ g_assert_cmpstr ("å", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("åå", 3); -+ g_assert_cmpstr ("å", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("åå", 4); -+ g_assert_cmpstr ("åå", ==, truncated.c_str ()); -+ truncated = StringUtils::Truncate("åå"); -+ g_assert_cmpstr ("åå", ==, truncated.c_str ()); - } - - static void - test_mangle (Fixture *fix, gconstpointer data) - { -- g_assert_cmpstr ("", ==, StringUtils::MangleUri("").c_str ()); -+ std::string mangled; -+ -+ mangled = StringUtils::MangleUri(""); -+ g_assert_cmpstr ("", ==, mangled.c_str ()); - -- g_assert_cmpstr ("file", ==, StringUtils::MangleUri("file").c_str ()); -- g_assert_cmpstr ("file___", ==, StringUtils::MangleUri("file://").c_str ()); -- g_assert_cmpstr ("http___www_zeitgeist_project_com", ==, -- StringUtils::MangleUri("http://www.zeitgeist-project.com").c_str ()); -+ mangled = StringUtils::MangleUri("file"); -+ g_assert_cmpstr ("file", ==, mangled.c_str ()); -+ mangled = StringUtils::MangleUri("file://"); -+ g_assert_cmpstr ("file___", ==, mangled.c_str ()); -+ mangled = StringUtils::MangleUri("http://www.zeitgeist-project.com"); -+ g_assert_cmpstr ("http___www_zeitgeist_project_com", ==, mangled.c_str ()); - -- g_assert_cmpstr ("scheme_no_spaces_in_uris", ==, -- StringUtils::MangleUri("scheme:no spaces in uris").c_str ()); -+ mangled = StringUtils::MangleUri("scheme:no spaces in uris"); -+ g_assert_cmpstr ("scheme_no_spaces_in_uris", ==, mangled.c_str ()); - } - - static void -@@ -189,44 +213,64 @@ test_ascii_fold (Fixture *fix, gconstpointer data) - static void - test_underscores (Fixture *fix, gconstpointer data) - { -- g_assert_cmpstr ("", ==, StringUtils::RemoveUnderscores ("").c_str ()); -+ std::string s; - -- g_assert_cmpstr (" ", ==, StringUtils::RemoveUnderscores ("_").c_str ()); -+ s = StringUtils::RemoveUnderscores (""); -+ g_assert_cmpstr ("", ==, s.c_str ()); - -- g_assert_cmpstr (" ", ==, StringUtils::RemoveUnderscores ("___").c_str ()); -+ s = StringUtils::RemoveUnderscores ("_"); -+ g_assert_cmpstr (" ", ==, s.c_str ()); - -- g_assert_cmpstr ("abcd", ==, StringUtils::RemoveUnderscores ("abcd").c_str ()); -+ s = StringUtils::RemoveUnderscores ("___"); -+ g_assert_cmpstr (" ", ==, s.c_str ()); - -- g_assert_cmpstr (" abcd ", ==, StringUtils::RemoveUnderscores ("_abcd_").c_str ()); -+ s = StringUtils::RemoveUnderscores ("abcd"); -+ g_assert_cmpstr ("abcd", ==, s.c_str ()); - -- g_assert_cmpstr ("a b c d", ==, StringUtils::RemoveUnderscores ("a_b_c_d").c_str ()); -+ s = StringUtils::RemoveUnderscores ("_abcd_"); -+ g_assert_cmpstr (" abcd ", ==, s.c_str ()); -+ -+ s = StringUtils::RemoveUnderscores ("a_b_c_d"); -+ g_assert_cmpstr ("a b c d", ==, s.c_str ()); - } - - static void - test_uncamelcase (Fixture *fix, gconstpointer data) - { -- g_assert_cmpstr ("", ==, StringUtils::UnCamelcase ("").c_str ()); -+ std::string s; -+ -+ s = StringUtils::UnCamelcase (""); -+ g_assert_cmpstr ("", ==, s.c_str ()); - -- g_assert_cmpstr ("abcd", ==, StringUtils::UnCamelcase ("abcd").c_str ()); -+ s = StringUtils::UnCamelcase ("abcd"); -+ g_assert_cmpstr ("abcd", ==, s.c_str ()); - -- g_assert_cmpstr ("Abcd", ==, StringUtils::UnCamelcase ("Abcd").c_str ()); -+ s = StringUtils::UnCamelcase ("Abcd"); -+ g_assert_cmpstr ("Abcd", ==, s.c_str ()); - -- g_assert_cmpstr ("ABCD", ==, StringUtils::UnCamelcase ("ABCD").c_str ()); -+ s = StringUtils::UnCamelcase ("ABCD"); -+ g_assert_cmpstr ("ABCD", ==, s.c_str ()); - -- g_assert_cmpstr ("ABcd", ==, StringUtils::UnCamelcase ("ABcd").c_str ()); -+ s = StringUtils::UnCamelcase ("ABcd"); -+ g_assert_cmpstr ("ABcd", ==, s.c_str ()); - -- g_assert_cmpstr ("Abcd Ef", ==, StringUtils::UnCamelcase ("AbcdEf").c_str ()); -+ s = StringUtils::UnCamelcase ("AbcdEf"); -+ g_assert_cmpstr ("Abcd Ef", ==, s.c_str ()); - -- g_assert_cmpstr ("Text Editor", ==, StringUtils::UnCamelcase ("Text Editor").c_str ()); -+ s = StringUtils::UnCamelcase ("Text Editor"); -+ g_assert_cmpstr ("Text Editor", ==, s.c_str ()); - -- g_assert_cmpstr ("py Karaoke", ==, StringUtils::UnCamelcase ("pyKaraoke").c_str ()); -+ s = StringUtils::UnCamelcase ("pyKaraoke"); -+ g_assert_cmpstr ("py Karaoke", ==, s.c_str ()); - -- g_assert_cmpstr ("Zeitgeist Project", ==, StringUtils::UnCamelcase ("ZeitgeistProject").c_str ()); -+ s = StringUtils::UnCamelcase ("ZeitgeistProject"); -+ g_assert_cmpstr ("Zeitgeist Project", ==, s.c_str ()); - -- g_assert_cmpstr ("Very Nice Camel Case Text", ==, StringUtils::UnCamelcase ("VeryNiceCamelCaseText").c_str ()); -+ s = StringUtils::UnCamelcase ("VeryNiceCamelCaseText"); -+ g_assert_cmpstr ("Very Nice Camel Case Text", ==, s.c_str ()); - -- g_assert_cmpstr ("Ňeedš Ťo Wórk Óń Útf Čhářacters As WelL", ==, -- StringUtils::UnCamelcase ("ŇeedšŤoWórkÓńÚtfČhářactersAsWelL").c_str ()); -+ s = StringUtils::UnCamelcase ("ŇeedšŤoWórkÓńÚtfČhářactersAsWelL"); -+ g_assert_cmpstr ("Ňeedš Ťo Wórk Óń Útf Čhářacters As WelL", ==, s.c_str ()); - } - - static void --- -2.4.6 - === removed file 'debian/patches/fix_autocomplete.diff' --- debian/patches/fix_autocomplete.diff 2017-02-19 17:50:22 +0000 +++ debian/patches/fix_autocomplete.diff 1970-01-01 00:00:00 +0000 @@ -1,18 +0,0 @@ -Index: zeitgeist-0.9.14/data/completions/zeitgeist-daemon -=================================================================== ---- zeitgeist-0.9.14.orig/data/completions/zeitgeist-daemon 2013-06-17 08:40:08.000000000 +0200 -+++ zeitgeist-0.9.14/data/completions/zeitgeist-daemon 2013-10-25 23:16:30.874139250 +0200 -@@ -5,10 +5,10 @@ - # - # By Siegfried-Angel Gevatter Pujals - --have zeitgeist-daemon && -+_have zeitgeist-daemon && - _zeitgeist_daemon() - { - local cur=${COMP_WORDS[COMP_CWORD]} - COMPREPLY=($(compgen -W "`zeitgeist-daemon --shell-completion`" -- $cur)) --} --[ "${have:-}" ] && complete -F _zeitgeist_daemon -o default zeitgeist-daemon -+} && -+complete -F _zeitgeist_daemon -o default zeitgeist-daemon === modified file 'debian/patches/nodisplay_autostart.patch' --- debian/patches/nodisplay_autostart.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/nodisplay_autostart.patch 2017-02-19 18:50:36 +0000 @@ -2,13 +2,14 @@ Author: Michael Terry Bug-Ubuntu: https://launchpad.net/bugs/803917 Forwarded: not-needed +--- + data/zeitgeist-datahub.desktop.in | 1 + + 1 file changed, 1 insertion(+) -Index: b/data/zeitgeist-datahub.desktop.in -=================================================================== --- a/data/zeitgeist-datahub.desktop.in +++ b/data/zeitgeist-datahub.desktop.in -@@ -9,3 +9,4 @@ - Categories= - GenericName= +@@ -5,3 +5,4 @@ Exec=zeitgeist-datahub + Terminal=false + Type=Application X-GNOME-Autostart-Delay=20 +NoDisplay=true === modified file 'debian/patches/pre_populator.patch' --- debian/patches/pre_populator.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/pre_populator.patch 2017-02-19 18:50:36 +0000 @@ -1,22 +1,24 @@ Description: Pre-populate the log with some events so that the dash isn't empty on first run. === modified file 'src/Makefile.am' -Index: zeitgeist-0.9.16/datahub/Makefile.am -=================================================================== ---- zeitgeist-0.9.16.orig/datahub/Makefile.am -+++ zeitgeist-0.9.16/datahub/Makefile.am -@@ -32,6 +32,7 @@ zeitgeist_datahub_VALASOURCES = \ - downloads-directory-provider.vala \ +--- + datahub/Makefile.am | 1 + datahub/pre-populator.vala | 117 +++++++++++++++++++++++++++++++++++++++++ + datahub/zeitgeist-datahub.vala | 3 + + 3 files changed, 121 insertions(+) + +--- a/datahub/Makefile.am ++++ b/datahub/Makefile.am +@@ -30,6 +30,7 @@ zeitgeist_datahub_VALASOURCES = \ + desktop-launch-listener.vala \ kde-recent-document-provider.vala \ recent-manager-provider.vala \ + pre-populator.vala \ utils.vala \ zeitgeist-datahub.vala \ $(NULL) -Index: zeitgeist-0.9.16/datahub/pre-populator.vala -=================================================================== --- /dev/null -+++ zeitgeist-0.9.16/datahub/pre-populator.vala ++++ b/datahub/pre-populator.vala @@ -0,0 +1,117 @@ +/* + * Copyright (C) 2012 Canonical Ltd. @@ -135,13 +137,11 @@ + } +} + -Index: zeitgeist-0.9.16/datahub/zeitgeist-datahub.vala -=================================================================== ---- zeitgeist-0.9.16.orig/datahub/zeitgeist-datahub.vala -+++ zeitgeist-0.9.16/datahub/zeitgeist-datahub.vala -@@ -124,6 +124,9 @@ public class DataHub : Object, DataHubSe - providers.prepend (new DesktopLaunchListener (this)); - } +--- a/datahub/zeitgeist-datahub.vala ++++ b/datahub/zeitgeist-datahub.vala +@@ -122,6 +122,9 @@ public class DataHub : Object, DataHubSe + + providers.prepend (new DesktopLaunchListener (this)); + // Ubuntu-specific + providers.prepend (new PrePopulator (this)); === modified file 'debian/patches/series' --- debian/patches/series 2017-02-19 17:50:22 +0000 +++ debian/patches/series 2017-02-19 19:24:45 +0000 @@ -1,11 +1,6 @@ -Give-the-D-Bus-service-files-the-correct-names.patch -Add-a-systemd-user-service-for-each-D-Bus-session-se.patch -fix_autocomplete.diff add_datahub_autostart_delay.patch disable-fts-on-touch.patch nodisplay_autostart.patch pre_populator.patch -fix-test-crash.patch skip-failing-tests.patch -startup-database-vacuum.patch -thread-default-context.patch +#startup-database-vacuum.patch === removed file 'debian/patches/thread-default-context.patch' --- debian/patches/thread-default-context.patch 2017-02-19 17:50:22 +0000 +++ debian/patches/thread-default-context.patch 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ -diff --git a/libzeitgeist/log.vala b/libzeitgeist/log.vala -index 100f0cc..20d3961 100644 ---- a/libzeitgeist/log.vala -+++ b/libzeitgeist/log.vala -@@ -86,7 +86,8 @@ public class Log : QueuedProxyWrapper - public Log () - { - monitors = new HashTable (direct_hash, direct_equal); -- MainLoop mainloop = new MainLoop(); -+ MainContext context = MainContext.get_thread_default(); -+ MainLoop mainloop = new MainLoop(context); - allow_direct_read = Utils.log_may_read_directly (); - - Bus.get_proxy.begin (BusType.SESSION, Utils.ENGINE_DBUS_NAME, === modified file 'debian/zeitgeist-core.install' --- debian/zeitgeist-core.install 2017-02-19 17:50:22 +0000 +++ debian/zeitgeist-core.install 2017-02-19 19:35:09 +0000 @@ -1,4 +1,3 @@ -usr/lib/zeitgeist/zeitgeist-fts usr/lib/*/zeitgeist/ usr/lib/systemd/user/zeitgeist.service usr/lib/systemd/user/zeitgeist-fts.service