Merge lp:~timo-jyrinki/ubuntu/utopic/rhythmbox/enable_grilo_rhythmbox into lp:ubuntu/utopic/rhythmbox

[Timo Jyrinki]

Build and install the grilo plugin (LP: #973295)

[Iain Lane (laney)]

Merged into ubuntu-desktop branch, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-24 16:50:11 +0000
+++ debian/changelog	2014-05-13 08:21:17 +0000
@@ -1,3 +1,9 @@
+rhythmbox (3.0.2-0ubuntu3) utopic; urgency=medium
+
+  * Build and install the grilo plugin (LP: #973295)
+
+ -- Florian Will <[e-mail]>  Wed, 30 Apr 2014 16:41:54 +0200
+
 rhythmbox (3.0.2-0ubuntu2) trusty; urgency=medium
 
   * debian/patches/git_error_by_one_segfault.patch:
 
=== modified file 'debian/control'
--- debian/control	2014-03-20 19:57:06 +0000
+++ debian/control	2014-05-13 08:21:17 +0000
@@ -59,7 +59,8 @@
                libpango1.0-doc,
                libgdk-pixbuf2.0-doc,
                gstreamer1.0-doc,
-               gstreamer1.0-plugins-base-doc
+               gstreamer1.0-plugins-base-doc,
+               libgrilo-0.2-dev
 Build-Conflicts: libmusicbrainz3-dev
 Standards-Version: 3.9.4
 X-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/rhythmbox/
 
=== modified file 'debian/control.in'
--- debian/control.in	2014-03-20 19:57:06 +0000
+++ debian/control.in	2014-05-13 08:21:17 +0000
@@ -55,7 +55,8 @@
                libpango1.0-doc,
                libgdk-pixbuf2.0-doc,
                gstreamer1.0-doc,
-               gstreamer1.0-plugins-base-doc
+               gstreamer1.0-plugins-base-doc,
+               libgrilo-0.2-dev
 Build-Conflicts: libmusicbrainz3-dev
 Standards-Version: 3.9.4
 X-Debian-Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/packages/unstable/rhythmbox/
 
=== modified file 'debian/rhythmbox-plugins.install'
--- debian/rhythmbox-plugins.install	2013-10-24 11:01:12 +0000
+++ debian/rhythmbox-plugins.install	2014-05-13 08:21:17 +0000
@@ -21,3 +21,4 @@
 usr/lib/rhythmbox/plugins/replaygain
 usr/share/rhythmbox/plugins/replaygain
 usr/lib/rhythmbox/plugins/sendto
+usr/lib/rhythmbox/plugins/grilo
 
=== modified file 'debian/rules'
--- debian/rules	2014-02-28 12:02:38 +0000
+++ debian/rules	2014-05-13 08:21:17 +0000
@@ -12,8 +12,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-lirc \
                              --disable-scrollkeeper \
-                             --enable-gtk-doc \
-                             --disable-grilo
+                             --enable-gtk-doc
 
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 DEB_CONFIGURE_EXTRA_FLAGS += --without-hal --with-gudev