Merge lp:~manishsinha/ubuntu/precise/totem/enable-zeitgeist-datasource into lp:ubuntu/precise/totem

Status: Needs review
Proposed branch: lp:~manishsinha/ubuntu/precise/totem/enable-zeitgeist-datasource
Merge into: lp:ubuntu/precise/totem
Diff against target: 59 lines (+13/-2)
4 files modified
debian/changelog (+6/-0)
debian/control (+4/-1)
debian/rules (+1/-1)
debian/totem-plugins.install (+2/-0)
To merge this branch: bzr merge lp:~manishsinha/ubuntu/precise/totem/enable-zeitgeist-datasource
Reviewer Review Type Date Requested Status
Jeremy Bícha Needs Fixing
Review via email: mp+80408@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 Bícha (jbicha) wrote :

Manish, please propose this merge against https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu and also reference your bug report. Thanks for your work!

review: Needs Fixing
187. By Manish Sinha (मनीष सिन्हा)

Enable zeitgeist-dp vala plugin for totem (LP: #879702)

Unmerged revisions

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

Enable zeitgeist-dp vala plugin for totem (LP: #879702)

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

Enable zeitgeist-dp vala plugin for totem

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 16:24:44 +0000
3+++ debian/changelog 2011-10-26 10:18:40 +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:30:17 +0000
17+++ debian/control 2011-10-26 10:18:40 +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/rules'
39--- debian/rules 2011-08-09 21:53:17 +0000
40+++ debian/rules 2011-10-26 10:18:40 +0000
41@@ -12,7 +12,7 @@
42 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
43
44 DEB_CONFIGURE_EXTRA_FLAGS += \
45- --enable-vala=no \
46+ --enable-vala=yes \
47 --disable-run-in-source-tree \
48 --disable-scrollkeeper
49
50
51=== modified file 'debian/totem-plugins.install'
52--- debian/totem-plugins.install 2011-05-20 16:38:02 +0000
53+++ debian/totem-plugins.install 2011-10-26 10:18:40 +0000
54@@ -1,3 +1,5 @@
55 debian/tmp/usr/lib/totem/plugins/[!gci]*
56 debian/tmp/usr/lib/totem/plugins/chapters
57 debian/tmp/usr/lib/totem/plugins/im-status
58+debian/tmp/usr/lib/totem/plugins/zeitgeist-dp
59+

Subscribers

People subscribed via source and target branches