Zeitgeist Data-Sources

Merge lp:~mortenmjelva/zeitgeist-datasources/trivia into lp:zeitgeist-datasources/0.8

  1. trivia
  2. Merge into trunk
Proposed by Morten Mjelva
Status: Merged
Approved by: Morten Mjelva
Approved revision: 100
Merged at revision: 100
Proposed branch: lp:~mortenmjelva/zeitgeist-datasources/trivia
Merge into: lp:zeitgeist-datasources/0.8
Diff against target: 55 lines (+15/-2)
3 files modified
configure.ac (+7/-1)
telepathy/Makefile.am (+7/-0)
telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service (+1/-1)
To merge this branch: bzr merge lp:~mortenmjelva/zeitgeist-datasources/trivia
Reviewer Review Type Date Requested Status
Morten Mjelva Approve
Review via email: mp+42775@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Morten Mjelva (mortenmjelva) wrote :

Typo fix after review by Seif Lotfy. Merging.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2010-11-10 16:39:21 +0000
3+++ configure.ac 2010-12-05 10:22:52 +0000
4@@ -65,7 +65,7 @@
5 AC_MSG_RESULT($all_plugins)
6
7 # The full list of plugins
8-allowed_plugins="bzr chrome eog firefox-libzg geany gedit rhythmbox totem-libzg vim emacs tomboy"
9+allowed_plugins="bzr chrome eog firefox-libzg geany gedit rhythmbox totem-libzg vim emacs tomboy telepathy"
10 # currently disabled = "epiphany"
11
12 # npapi-plugin has a template Makefile.am, but don't use it directly
13@@ -222,6 +222,8 @@
14 emacs)
15 AM_PATH_LISPDIR
16 ;;
17+ telepathy)
18+ ;;
19 *)
20 plugin_error_or_ignore "${plugin} is not handled"
21 continue
22@@ -307,6 +309,10 @@
23 AC_CONFIG_FILES([emacs/Makefile])
24 continue 2
25 ;;
26+ telepathy)
27+ AC_CONFIG_FILES([telepathy/Makefile])
28+ continue 2
29+ ;;
30 *)
31 AC_MSG_ERROR([cannot configure ${allowed_plugin}])
32 continue 2
33
34=== added file 'telepathy/Makefile.am'
35--- telepathy/Makefile.am 1970-01-01 00:00:00 +0000
36+++ telepathy/Makefile.am 2010-12-05 10:22:52 +0000
37@@ -0,0 +1,7 @@
38+servicedir = ${datadir}/dbus-1/services
39+nodist_service_DATA = org.freedesktop.Telepathy.Client.Zeitgeist.service
40+
41+appdir = ${datadir}/telepathy/clients
42+app_DATA = Zeitgeist.client
43+
44+bin_SCRIPTS = zeitgeist-telepathy-observer
45
46=== modified file 'telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service'
47--- telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service 2010-12-04 20:22:46 +0000
48+++ telepathy/org.freedesktop.Telepathy.Client.Zeitgeist.service 2010-12-05 10:22:52 +0000
49@@ -1,3 +1,3 @@
50 [D-BUS Service]
51 Name=org.freedesktop.Telepathy.Client.Zeitgeist
52-Exec=/home/seif/Projects/zeitgeist-dataproviders/telepathy/zeitgeist-telepathy-observer.py
53+Exec=/usr/bin/zeitgeist-telepathy-observer
54
55=== renamed file 'telepathy/zeitgeist-telepathy-observer.py' => 'telepathy/zeitgeist-telepathy-observer'

Subscribers

People subscribed via source and target branches