=== modified file 'debian/changelog'
--- debian/changelog	2016-08-03 03:48:44 +0000
+++ debian/changelog	2016-08-03 03:48:53 +0000
@@ -1,3 +1,12 @@
+grilo-plugins (0.3.2-1ubuntu2) UNRELEASED; urgency=low
+
+  * Merge with Debian unstable (LP: #1609215). Remaining changes:
+    - Split package into -base and -extra
+    - Build with --fail-missing to ensure we install everything.
+  * Have grilo-plugins-0.3-base install the Lua plugins (LP: #1570157)
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Sat, 02 Jul 2016 22:50:03 -0400
+
 grilo-plugins (0.3.2-1) unstable; urgency=medium
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2016-08-03 03:48:44 +0000
+++ debian/control	2016-08-03 03:48:53 +0000
@@ -1,7 +1,8 @@
 Source: grilo-plugins
 Section: libs
 Priority: optional
-Maintainer: Alberto Garcia <berto@igalia.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Alberto Garcia <berto@igalia.com>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                autotools-dev,
@@ -34,15 +35,15 @@
 Standards-Version: 3.9.8
 Homepage: https://wiki.gnome.org/Projects/Grilo
 
-Package: grilo-plugins-0.3
+Package: grilo-plugins-0.3-base
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
-Breaks: grilo-plugins-0.2
-Replaces: grilo-plugins-0.2
-Recommends: dleyna-server
+Breaks: grilo-plugins-0.2, grilo-plugins-0.2-base, grilo-plugins-0.3-extra (<< 0.3.2-1ubuntu2~)
+Replaces: grilo-plugins-0.2, grilo-plugins-0.2-base, grilo-plugins-0.3-extra (<< 0.3.2-1ubuntu2~)
+Suggests: grilo-plugins-0.3-extra
 Description: Framework for discovering and browsing media - Plugins
  Grilo is a framework focused on making media discovery and browsing
  easy for application developers.
@@ -60,24 +61,16 @@
  This package contains the set of plugins officially distributed with
  Grilo:
    * Bookmarks
-   * Chromaprint
-   * dLeyna
-   * DAAP / DPAP
    * Filesystem
-   * Flickr
-   * Freebox
    * Gravatar
    * Jamendo
    * Local metadata (album art and thumbnails)
-   * Magnatune
    * Metadata Store
    * OpenSubtitles
    * Optical Media
-   * Podcasts
    * Rai.tv
    * SHOUTcast
    * TheTVDB
-   * TMDb
    * Tracker
    * Vimeo
    * Youtube
@@ -95,3 +88,49 @@
      - Spotify Cover
      - TheGamesDB.net
      - Video title parsing
+
+Package: grilo-plugins-0.3-extra
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         grilo-plugins-0.3-base
+Breaks: grilo-plugins-0.2-extra
+Replaces: grilo-plugins-0.2-extra
+Recommends: dleyna-server
+Description: Framework for discovering and browsing media - Extra Plugins
+ Grilo is a framework focused on making media discovery and browsing
+ easy for application developers.
+ .
+ More precisely, Grilo provides:
+   * A single, high-level API that abstracts the differences among
+     various media content providers, allowing application developers
+     to integrate content from various services and sources easily.
+   * A collection of plugins for accessing content from various media
+     providers. Developers can share efforts and code by writing
+     plugins for the framework that are application agnostic.
+   * A flexible API that allows plugin developers to write plugins of
+     various kinds.
+ .
+ This package contains these plugins officially distributed with Grilo:
+   * Chromaprint
+   * DAAP / DPAP
+   * dLeyna
+   * Flickr
+   * Freebox
+   * Magnatune
+   * Podcasts
+   * TMDb
+
+Package: grilo-plugins-0.3
+Architecture: all
+Priority: extra
+Section: oldlibs
+Multi-Arch: foreign
+Depends: grilo-plugins-0.3-base,
+         grilo-plugins-0.3-extra,
+         ${misc:Depends}
+Description: transitional package
+ This is a transitional package to ease upgrades to
+ grilo-plugins-0.3-base and grilo-plugins-0.3-extra. It can safely be removed.

=== renamed file 'debian/install' => 'debian/grilo-plugins-0.3-base.install'
--- debian/install	2016-08-03 03:48:44 +0000
+++ debian/grilo-plugins-0.3-base.install	2016-08-03 03:48:53 +0000
@@ -1,4 +1,18 @@
-usr/lib/*/grilo-0.3/*.so
+usr/lib/*/grilo-0.3/*bookmarks*
+usr/lib/*/grilo-0.3/*factory*
+usr/lib/*/grilo-0.3/*filesystem*
+usr/lib/*/grilo-0.3/*gravatar*
+usr/lib/*/grilo-0.3/*jamendo*
+usr/lib/*/grilo-0.3/*local*
+usr/lib/*/grilo-0.3/*metadata*store*
+usr/lib/*/grilo-0.3/*optical*media*
+usr/lib/*/grilo-0.3/*raitv*
+usr/lib/*/grilo-0.3/*shoutcast*
+usr/lib/*/grilo-0.3/*opensubtitles*
+usr/lib/*/grilo-0.3/*tracker*
+usr/lib/*/grilo-0.3/*tvdb*
+usr/lib/*/grilo-0.3/*vimeo*
+usr/lib/*/grilo-0.3/*youtube*
 usr/share/grilo-plugins
 usr/share/help
 usr/share/locale

=== renamed file 'debian/grilo-plugins-0.3.lintian-overrides' => 'debian/grilo-plugins-0.3-extra.lintian-overrides'
--- debian/grilo-plugins-0.3.lintian-overrides	2016-08-03 03:48:44 +0000
+++ debian/grilo-plugins-0.3-extra.lintian-overrides	2016-08-03 03:48:53 +0000
@@ -1,1 +1,1 @@
-grilo-plugins-0.3: hardening-no-fortify-functions usr/lib/*/grilo-0.3/libgrldleyna.so
+grilo-plugins-0.3-extra: hardening-no-fortify-functions usr/lib/*/grilo-0.3/libgrldleyna.so

=== modified file 'debian/rules'
--- debian/rules	2016-08-03 03:48:44 +0000
+++ debian/rules	2016-08-03 03:48:53 +0000
@@ -11,6 +11,9 @@
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/tmp
 
+override_dh_install:
+	dh_install -X.la --fail-missing
+
 override_dh_auto_test:
 
 override_dh_makeshlibs: