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

[Manish Sinha (मनीष सिन्हा)]

* 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

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

[Jeremy Bícha (jbicha)]

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'

[lp:~manishsinha/totem/enable-zg-dp-building]

122. By Manish Sinha (मनीष सिन्हा) on 2011-10-26

Made the necessary changes to debian/control.in too

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

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)

[Jeremy Bícha (jbicha)]

Thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-15 21:13:41 +0000
+++ debian/changelog	2011-10-26 20:23:51 +0000
@@ -1,3 +1,9 @@
+totem (3.0.1-0ubuntu9) oneiric; urgency=low
+
+  * Enable zeitgeist-dp vala plugin for totem (LP: #879702) 
+
+ -- Manish Sinha <[e-mail]>  Wed, 26 Oct 2011 06:01:03 +0530
+
 totem (3.0.1-0ubuntu8) precise; urgency=low
 
   * debian/patches/04_port_to_gobject.patch:
 
=== modified file 'debian/control'
--- debian/control	2011-10-11 00:58:24 +0000
+++ debian/control	2011-10-26 20:23:51 +0000
@@ -60,6 +60,8 @@
                hardening-wrapper,
                dh-autoreconf,
                gnome-common,
+               valac,
+               libzeitgeist-dev,
 Standards-Version: 3.8.4
 Homepage: http://www.gnome.org/projects/totem/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu
@@ -178,7 +180,8 @@
          gir1.2-peas-1.0,
          python-gobject (>= 2.27),
          python-xdg,
-         python-httplib2
+         python-httplib2,
+         libzeitgeist-1.0-1
 Recommends: gnome-settings-daemon
 Suggests: gromit
 Description: Plugins for the Totem media player
 
=== modified file 'debian/control.in'
--- debian/control.in	2011-10-11 00:58:24 +0000
+++ debian/control.in	2011-10-26 20:23:51 +0000
@@ -55,6 +55,8 @@
                hardening-wrapper,
                dh-autoreconf,
                gnome-common,
+               valac,
+               libzeitgeist-dev,
 Standards-Version: 3.8.4
 Homepage: http://www.gnome.org/projects/totem/
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/totem/ubuntu
@@ -173,7 +175,8 @@
          gir1.2-peas-1.0,
          python-gobject (>= 2.27),
          python-xdg,
-         python-httplib2
+         python-httplib2,
+         libzeitgeist-1.0-1
 Recommends: gnome-settings-daemon
 Suggests: gromit
 Description: Plugins for the Totem media player
 
=== modified file 'debian/rules'
--- debian/rules	2011-08-10 04:50:38 +0000
+++ debian/rules	2011-10-26 20:23:51 +0000
@@ -12,7 +12,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
-	--enable-vala=no \
+	--enable-vala=yes \
 	--disable-run-in-source-tree \
 	--disable-scrollkeeper
 
 
=== modified file 'debian/totem-plugins.install'
--- debian/totem-plugins.install	2011-05-20 14:37:43 +0000
+++ debian/totem-plugins.install	2011-10-26 20:23:51 +0000
@@ -1,3 +1,5 @@
 debian/tmp/usr/lib/totem/plugins/[!gci]*
 debian/tmp/usr/lib/totem/plugins/chapters
 debian/tmp/usr/lib/totem/plugins/im-status
+debian/tmp/usr/lib/totem/plugins/zeitgeist-dp
+