Merge lp:~timo-jyrinki/ubuntu/utopic/totem/enable_grilo_totem into lp:ubuntu/utopic/totem

[Timo Jyrinki]

* Enable grilo for upnp/dlna support (LP: #1035701)
  - bring back libgrilo-0.2-dev build-dep
  - install grilo plugins
  - drop 93_grilo_optional.patch

[Doug McMahon (mc3man)]

As mentioned (in bug), if actually going ahead then should take the opportunity to square up the plugin's control.in file > Description: ... as it's currently incorrect & these changes won't make it any less so.
(LP: #1313298

[Iain Lane (laney)]

Merged into ubuntu-desktop branch, thanks!

Sorry for not updating the description.

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2013-12-23 18:34:50 +0000
+++ configure.ac	2014-05-13 08:21:37 +0000
@@ -482,7 +482,7 @@
 			PKG_CHECK_MODULES(LIBGRILO, grilo-0.2 >= $GRILO_REQS,
 				[HAVE_LIBGRILO=yes], [HAVE_LIBGRILO=no])
 			if test "${HAVE_LIBGRILO}" != "yes" ; then
-				plugin_error_or_ignore "you need libgrilo >= $GRILO_REQS installed for the Grilo plugin"
+				plugin_error "you need libgrilo >= $GRILO_REQS installed for the Grilo plugin"
 				add_plugin="0"
 			fi
 		;;

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-27 01:08:33 +0000
+++ debian/changelog	2014-05-13 08:21:37 +0000
@@ -1,3 +1,12 @@
+totem (3.10.1-1ubuntu6) utopic; urgency=medium
+
+  * Enable grilo for upnp/dlna support (LP: #1035701)
+    - bring back libgrilo-0.2-dev build-dep
+    - install grilo plugins
+    - drop 93_grilo_optional.patch
+ 
+ -- Tim Lunn <[e-mail]>  Mon, 12 May 2014 16:48:28 +1000
+
 totem (3.10.1-1ubuntu5) utopic; urgency=high
 
   * No change rebuild against libcogl20.

=== modified file 'debian/control'
--- debian/control	2014-03-31 17:40:40 +0000
+++ debian/control	2014-05-13 08:21:37 +0000
@@ -33,7 +33,7 @@
                libgdk-pixbuf2.0-dev (>= 2.23.0),
                libgirepository1.0-dev (>= 0.9.12),
                libglib2.0-dev (>= 2.33.0),
-#               libgrilo-0.2-dev,
+               libgrilo-0.2-dev,
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
                libgtk-3-dev (>= 3.5.2),

=== modified file 'debian/control.in'
--- debian/control.in	2014-02-20 11:40:43 +0000
+++ debian/control.in	2014-05-13 08:21:37 +0000
@@ -29,7 +29,7 @@
                libgdk-pixbuf2.0-dev (>= 2.23.0),
                libgirepository1.0-dev (>= 0.9.12),
                libglib2.0-dev (>= 2.33.0),
-#               libgrilo-0.2-dev,
+               libgrilo-0.2-dev,
                libgstreamer-plugins-base1.0-dev,
                libgstreamer1.0-dev,
                libgtk-3-dev (>= 3.5.2),

=== removed file 'debian/patches/93_grilo_optional.patch'
--- debian/patches/93_grilo_optional.patch	2013-05-26 00:07:51 +0000
+++ debian/patches/93_grilo_optional.patch	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-Description: Don't die if we can't build the grilo plugin. We should be MIRing grilo soon to make this no longer required.
-Forwarded: not-needed
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -466,7 +466,7 @@
- 			PKG_CHECK_MODULES(LIBGRILO, grilo-0.2 >= $GRILO_REQS,
- 				[HAVE_LIBGRILO=yes], [HAVE_LIBGRILO=no])
- 			if test "${HAVE_LIBGRILO}" != "yes" ; then
--				plugin_error "you need libgrilo >= $GRILO_REQS installed for the Grilo plugin"
-+				plugin_error_or_ignore "you need libgrilo >= $GRILO_REQS installed for the Grilo plugin"
- 				add_plugin="0"
- 			fi
- 		;;

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-31 17:40:40 +0000
+++ debian/patches/series	2014-05-13 08:21:37 +0000
@@ -1,7 +1,6 @@
 correct_desktop_mimetypes.patch
 91_quicklist_entries.patch
 92_gst-plugins-good.patch
-93_grilo_optional.patch
 revert_shell_menu.patch
 git-fix-subtitle-downloader.patch
 git_clutter_correct_use.patch

=== modified file 'debian/totem-plugins.install'
--- debian/totem-plugins.install	2013-12-23 18:34:50 +0000
+++ debian/totem-plugins.install	2014-05-13 08:21:37 +0000
@@ -5,6 +5,7 @@
 usr/lib/totem/plugins/brasero-disc-recorder
 usr/lib/totem/plugins/chapters
 usr/lib/totem/plugins/dbus
+usr/lib/totem/plugins/grilo
 usr/lib/totem/plugins/im-status
 usr/lib/totem/plugins/lirc
 usr/lib/totem/plugins/media-player-keys