Merge lp:~manishsinha/totem/enable-zg-dp-building into lp:~ubuntu-desktop/totem/ubuntu

Status: Merged
Merged at revision: 121
Proposed branch: lp:~manishsinha/totem/enable-zg-dp-building
Merge into: lp:~ubuntu-desktop/totem/ubuntu
Diff against target: 82 lines (+17/-3)
5 files modified
debian/changelog (+6/-0)
debian/control (+4/-1)
debian/control.in (+4/-1)
debian/rules (+1/-1)
debian/totem-plugins.install (+2/-0)
To merge this branch: bzr merge lp:~manishsinha/totem/enable-zg-dp-building
Reviewer Review Type Date Requested Status
Jeremy Bicha Approve
Review via email: mp+80492@code.launchpad.net

Commit message

* debian/rules: Enabled vala support
* debian/control: Added valac, libzeitgeist-dev as build-dep and libzeitgeist-1.0-1 as dependency of totem-plugins
* debian/totem-plugins.intall: Added another entry for zeitgeist-dp

Description of the change

Enabled Zeitgeist datasource

Changed made
* Enabled the vala support in debian/rules
* Added an entry in totem-plugins.install
* Updated the respective dependencies in debian/control

To post a comment you must log in.
Revision history for this message
Jeremy Bicha (jbicha) wrote :

Please make the same changes to debian/control.in that you do to debian/control.

The plugin appears to work for me. I activated it, played a video, and the video showed up in GNOME Activity Journal. I do get this error on activation but it didn't seem to be too serious.

GLib-GObject-CRITICAL **: Property 'object' on class 'ZeitgeistDpPlugin' has type 'TotemObject' which is different from the type 'GObject', of the property on interface 'PeasActivatable'

122. By Manish Sinha (मनीष सिन्हा)

Made the necessary changes to debian/control.in too

Revision history for this message
Manish Sinha (मनीष सिन्हा) (manishsinha) wrote :

I don't think that is much to be worried about. I keep on getting such messages even when running gaj from command line (though not the same)

Revision history for this message
Jeremy Bicha (jbicha) wrote :

Thank you!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-10-15 21:13:41 +0000
3+++ debian/changelog 2011-10-26 20:23:51 +0000
4@@ -1,3 +1,9 @@
5+totem (3.0.1-0ubuntu9) oneiric; urgency=low
6+
7+ * Enable zeitgeist-dp vala plugin for totem (LP: #879702)
8+
9+ -- Manish Sinha <manishsinha@ubuntu.com> Wed, 26 Oct 2011 06:01:03 +0530
10+
11 totem (3.0.1-0ubuntu8) precise; urgency=low
12
13 * debian/patches/04_port_to_gobject.patch:
14
15=== modified file 'debian/control'
16--- debian/control 2011-10-11 00:58:24 +0000
17+++ debian/control 2011-10-26 20:23:51 +0000
18@@ -60,6 +60,8 @@
19 hardening-wrapper,
20 dh-autoreconf,
21 gnome-common,
22+ valac,
23+ libzeitgeist-dev,
24 Standards-Version: 3.8.4
25 Homepage: http://www.gnome.org/projects/totem/
26 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu
27@@ -178,7 +180,8 @@
28 gir1.2-peas-1.0,
29 python-gobject (>= 2.27),
30 python-xdg,
31- python-httplib2
32+ python-httplib2,
33+ libzeitgeist-1.0-1
34 Recommends: gnome-settings-daemon
35 Suggests: gromit
36 Description: Plugins for the Totem media player
37
38=== modified file 'debian/control.in'
39--- debian/control.in 2011-10-11 00:58:24 +0000
40+++ debian/control.in 2011-10-26 20:23:51 +0000
41@@ -55,6 +55,8 @@
42 hardening-wrapper,
43 dh-autoreconf,
44 gnome-common,
45+ valac,
46+ libzeitgeist-dev,
47 Standards-Version: 3.8.4
48 Homepage: http://www.gnome.org/projects/totem/
49 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu
50@@ -173,7 +175,8 @@
51 gir1.2-peas-1.0,
52 python-gobject (>= 2.27),
53 python-xdg,
54- python-httplib2
55+ python-httplib2,
56+ libzeitgeist-1.0-1
57 Recommends: gnome-settings-daemon
58 Suggests: gromit
59 Description: Plugins for the Totem media player
60
61=== modified file 'debian/rules'
62--- debian/rules 2011-08-10 04:50:38 +0000
63+++ debian/rules 2011-10-26 20:23:51 +0000
64@@ -12,7 +12,7 @@
65 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
66
67 DEB_CONFIGURE_EXTRA_FLAGS += \
68- --enable-vala=no \
69+ --enable-vala=yes \
70 --disable-run-in-source-tree \
71 --disable-scrollkeeper
72
73
74=== modified file 'debian/totem-plugins.install'
75--- debian/totem-plugins.install 2011-05-20 14:37:43 +0000
76+++ debian/totem-plugins.install 2011-10-26 20:23:51 +0000
77@@ -1,3 +1,5 @@
78 debian/tmp/usr/lib/totem/plugins/[!gci]*
79 debian/tmp/usr/lib/totem/plugins/chapters
80 debian/tmp/usr/lib/totem/plugins/im-status
81+debian/tmp/usr/lib/totem/plugins/zeitgeist-dp
82+

Subscribers

People subscribed via source and target branches