Here is the patch to split grilo-plugins into -base and -extra. I have also included the remainder of the Ubuntu delta as extra patches here, however these are only required for the 0.2.14 branch of grilo-plugins
>From b3b0041120b47af35b09f0cb04bc655783ebe5e6 Mon Sep 17 00:00:00 2001 From: Tim Lunn <[email protected]> Date: Sat, 21 Nov 2015 15:11:35 +1100 Subject: [PATCH 1/3] * Split package into -base and -extra * Build with --fail-missing so we install everything.
--- debian/changelog | 7 +++ debian/control | 70 +++++++++++++++++++----- debian/docs | 2 - debian/grilo-plugins-0.2-base.docs | 2 + debian/grilo-plugins-0.2-base.install | 19 +++++++ debian/grilo-plugins-0.2-extra.install | 10 ++++ debian/grilo-plugins-0.2-extra.lintian-overrides | 2 + debian/grilo-plugins-0.2.lintian-overrides | 2 - debian/install | 5 -- debian/rules | 3 + 10 files changed, 98 insertions(+), 24 deletions(-) delete mode 100644 debian/docs create mode 100644 debian/grilo-plugins-0.2-base.docs create mode 100644 debian/grilo-plugins-0.2-base.install create mode 100644 debian/grilo-plugins-0.2-extra.install create mode 100644 debian/grilo-plugins-0.2-extra.lintian-overrides delete mode 100644 debian/grilo-plugins-0.2.lintian-overrides delete mode 100644 debian/install diff --git a/debian/changelog b/debian/changelog index bac8476..43e553b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +grilo-plugins (0.2.14-6) UNRELEASED; urgency=low + + * Split package into -base and -extra + * Build with --fail-missing so we install everything. + + -- Tim Lunn <[email protected]> Sat, 21 Nov 2015 15:04:20 +1100 + grilo-plugins (0.2.14-5) unstable; urgency=medium * The TheTVDB plugin fails during make check if the home directory is diff --git a/debian/control b/debian/control index 3ae93c9..113e49d 100644 --- a/debian/control +++ b/debian/control @@ -33,13 +33,26 @@ Standards-Version: 3.9.6 Homepage: http://live.gnome.org/Grilo Package: grilo-plugins-0.2 +Architecture: all +Priority: extra +Section: oldlibs +Depends: grilo-plugins-0.2-base, + grilo-plugins-0.2-extra, + ${misc:Depends} +Description: transitional dummy package + This is a transitional dummy package to ease upgrades to + grilo-plugins-0.2-base and grilo-plugins-0.2-extra. It can safely be removed. + +Package: grilo-plugins-0.2-base Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Recommends: dleyna-server -Description: Framework for discovering and browsing media - Plugins +Suggests: grilo-plugins-0.2-extra +Breaks: grilo-plugins-0.2 (<< 0.2.14-6~) +Replaces: grilo-plugins-0.2 (<< 0.2.14-6~) +Description: Framework for discovering and browsing media - Base Plugins Grilo is a framework focused on making media discovery and browsing easy for application developers. . @@ -53,27 +66,18 @@ Description: Framework for discovering and browsing media - Plugins * A flexible API that allows plugin developers to write plugins of various kinds. . - This package contains the set of plugins officially distributed with - Grilo: + This package contains these plugins officially distributed with Grilo: * Apple Trailers * Blip.tv * Bookmarks - * dLeyna - * DMAP * Filesystem - * Flickr - * Freebox * Gravatar * Jamendo * Last.fm (for album art) * Local metadata (album art and thumbnails) - * Lua Factory - * Magnatune * Metadata Store * OpenSubtitles * Optical Media - * Pocket - * Podcasts * Rai.tv * SHOUTcast * TheTVDB @@ -82,15 +86,51 @@ Description: Framework for discovering and browsing media - Plugins * Vimeo * Youtube +Package: grilo-plugins-0.2-extra +Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} +Depends: ${shlibs:Depends}, + ${misc:Depends}, + grilo-plugins-0.2-base +Recommends: dleyna-server +Breaks: grilo-plugins-0.2 (<< 0.2.14-6~) +Replaces: grilo-plugins-0.2 (<< 0.2.14-6~) +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: + * dLeyna + * DMAP + * Flickr + * Freebox + * Lua Factory + * Magnatune + * Pocket + * Podcasts + * TMDb + Package: grilo-plugins-0.2-dbg Section: debug Priority: extra Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: grilo-plugins-0.2 (= ${binary:Version}), +Depends: grilo-plugins-0.2-base (= ${binary:Version}), + grilo-plugins-0.2-extra (= ${binary:Version}), ${misc:Depends} -Description: Framework for discovering and browsing media - Plugin debugging symbols +Description: grilo-plugins-0.2 debuging symbols Grilo is a framework focused on making media discovery and browsing easy for application developers. . @@ -105,4 +145,4 @@ Description: Framework for discovering and browsing media - Plugin debugging sym various kinds. . This package contains the debugging symbols for the Grilo plugins in - grilo-plugins-0.2. + grilo-plugins-0.2-base and grilo-plugins-0.2-extra. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 3cc350b..0000000 --- a/debian/docs +++ /dev/null @@ -1,2 +0,0 @@ -AUTHORS -NEWS diff --git a/debian/grilo-plugins-0.2-base.docs b/debian/grilo-plugins-0.2-base.docs new file mode 100644 index 0000000..3cc350b --- /dev/null +++ b/debian/grilo-plugins-0.2-base.docs @@ -0,0 +1,2 @@ +AUTHORS +NEWS diff --git a/debian/grilo-plugins-0.2-base.install b/debian/grilo-plugins-0.2-base.install new file mode 100644 index 0000000..b439baa --- /dev/null +++ b/debian/grilo-plugins-0.2-base.install @@ -0,0 +1,19 @@ +/usr/lib/*/grilo-0.2/*apple*trailers* +/usr/lib/*/grilo-0.2/*bliptv* +/usr/lib/*/grilo-0.2/*bookmarks* +/usr/lib/*/grilo-0.2/*filesystem* +/usr/lib/*/grilo-0.2/*gravatar* +/usr/lib/*/grilo-0.2/*jamendo* +/usr/lib/*/grilo-0.2/*lastfm*albumart* +/usr/lib/*/grilo-0.2/*local* +/usr/lib/*/grilo-0.2/*metadata*store* +/usr/lib/*/grilo-0.2/*optical*media* +/usr/lib/*/grilo-0.2/*raitv* +/usr/lib/*/grilo-0.2/*shoutcast* +/usr/lib/*/grilo-0.2/*opensubtitles* +/usr/lib/*/grilo-0.2/*tracker* +/usr/lib/*/grilo-0.2/*tvdb* +/usr/lib/*/grilo-0.2/*vimeo* +/usr/lib/*/grilo-0.2/*youtube* +usr/share/help +usr/share/locale diff --git a/debian/grilo-plugins-0.2-extra.install b/debian/grilo-plugins-0.2-extra.install new file mode 100644 index 0000000..39f227c --- /dev/null +++ b/debian/grilo-plugins-0.2-extra.install @@ -0,0 +1,10 @@ +/usr/lib/*/grilo-0.2/*dleyna* +/usr/lib/*/grilo-0.2/*dmap* +/usr/lib/*/grilo-0.2/*flickr* +/usr/lib/*/grilo-0.2/*freebox* +/usr/lib/*/grilo-0.2/*factory* +/usr/lib/*/grilo-0.2/*magnatune* +/usr/lib/*/grilo-0.2/*pocket* +/usr/lib/*/grilo-0.2/*podcasts* +/usr/lib/*/grilo-0.2/*tmdb* +/usr/share/grilo-plugins diff --git a/debian/grilo-plugins-0.2-extra.lintian-overrides b/debian/grilo-plugins-0.2-extra.lintian-overrides new file mode 100644 index 0000000..7e876e1 --- /dev/null +++ b/debian/grilo-plugins-0.2-extra.lintian-overrides @@ -0,0 +1,2 @@ +grilo-plugins-0.2-extra: hardening-no-fortify-functions usr/lib/*/grilo-0.2/libgrldleyna.so +grilo-plugins-0.2-extra: hardening-no-fortify-functions usr/lib/*/grilo-0.2/libgrlluafactory.so diff --git a/debian/grilo-plugins-0.2.lintian-overrides b/debian/grilo-plugins-0.2.lintian-overrides deleted file mode 100644 index 2226077..0000000 --- a/debian/grilo-plugins-0.2.lintian-overrides +++ /dev/null @@ -1,2 +0,0 @@ -grilo-plugins-0.2: hardening-no-fortify-functions usr/lib/*/grilo-0.2/libgrldleyna.so -grilo-plugins-0.2: hardening-no-fortify-functions usr/lib/*/grilo-0.2/libgrlluafactory.so diff --git a/debian/install b/debian/install deleted file mode 100644 index 4aaf159..0000000 --- a/debian/install +++ /dev/null @@ -1,5 +0,0 @@ -usr/lib/*/grilo-0.2/*.so -usr/lib/*/grilo-0.2/*.xml -usr/share/grilo-plugins -usr/share/help -usr/share/locale diff --git a/debian/rules b/debian/rules index ebcd7c6..bcdbcfe 100755 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,9 @@ override_dh_auto_configure: override_dh_auto_install: dh_auto_install --destdir=debian/tmp +override_dh_install: + dh_install -X.la --fail-missing + override_dh_makeshlibs: override_dh_strip: -- 2.6.2 >From 37a93381a4def738f9f0c96adab3787b85c5fce6 Mon Sep 17 00:00:00 2001 From: Tim Lunn <[email protected]> Date: Sat, 21 Nov 2015 15:40:19 +1100 Subject: [PATCH 2/3] debian/patches: cherry-pick git patches * debian/patches: cherry-pick git patches - 0001-guardianvideos-fix-URL-format-string.patch: Cherry-pick. guardianvideos: fix URL format string The online service complains loudly if passed 1.0 instead of 1, let's make sure values are formatted as integers. - 0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch: Take patch from upstream bug to fix notification of deletions. --- debian/changelog | 7 ++++++ ...ks-Notify-about-a-removal-if-there-was-no.patch | 28 +++++++++++++++++++++ ...0001-guardianvideos-fix-URL-format-string.patch | 29 ++++++++++++++++++++++ debian/patches/series | 2 ++ 4 files changed, 66 insertions(+) create mode 100644 debian/patches/0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch create mode 100644 debian/patches/0001-guardianvideos-fix-URL-format-string.patch diff --git a/debian/changelog b/debian/changelog index 43e553b..dad4d29 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,13 @@ grilo-plugins (0.2.14-6) UNRELEASED; urgency=low * Split package into -base and -extra * Build with --fail-missing so we install everything. + * debian/patches: cherry-pick git patches + - 0001-guardianvideos-fix-URL-format-string.patch: + Cherry-pick. guardianvideos: fix URL format string The online service + complains loudly if passed 1.0 instead of 1, let's make sure values are + formatted as integers. + - 0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch: + Take patch from upstream bug to fix notification of deletions. -- Tim Lunn <[email protected]> Sat, 21 Nov 2015 15:04:20 +1100 diff --git a/debian/patches/0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch b/debian/patches/0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch new file mode 100644 index 0000000..b3f6896 --- /dev/null +++ b/debian/patches/0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch @@ -0,0 +1,28 @@ +From 48c868c20cc59cbfa94f67b245a056e9f79b4067 Mon Sep 17 00:00:00 2001 +From: Iain Lane <[email protected]> +Date: Tue, 7 Jul 2015 13:06:46 +0100 +Subject: [PATCH] grl-bookmarks: Notify about a removal if there was no error + +We were incorrectly checking that there *was* an error when deciding +whether to notify of removals. This led to missing notifications for +successful removals. +--- + src/bookmarks/grl-bookmarks.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bookmarks/grl-bookmarks.c b/src/bookmarks/grl-bookmarks.c +index c7f0109..2fb75b0 100644 +--- a/src/bookmarks/grl-bookmarks.c ++++ b/src/bookmarks/grl-bookmarks.c +@@ -631,7 +631,7 @@ remove_bookmark (GrlBookmarksSource *bookmarks_source, + + g_object_unref (resource); + +- if (*error != NULL && bookmarks_source->priv->notify_changes) { ++ if (*error == NULL && bookmarks_source->priv->notify_changes) { + /* We can improve accuracy computing the parent container of removed + element */ + grl_source_notify_change (GRL_SOURCE (bookmarks_source), +-- +2.1.4 + diff --git a/debian/patches/0001-guardianvideos-fix-URL-format-string.patch b/debian/patches/0001-guardianvideos-fix-URL-format-string.patch new file mode 100644 index 0000000..2bae6d2 --- /dev/null +++ b/debian/patches/0001-guardianvideos-fix-URL-format-string.patch @@ -0,0 +1,29 @@ +From 65698590834ce3bb7a836d7e14b36a2ba87e0481 Mon Sep 17 00:00:00 2001 +From: Giovanni Campagna <[email protected]> +Date: Mon, 20 Apr 2015 18:20:37 -0700 +Subject: [PATCH] guardianvideos: fix URL format string + +The online service complains loudly if passed 1.0 instead of 1, +let's make sure values are formatted as integers. + +https://bugzilla.gnome.org/show_bug.cgi?id=748224 +--- + src/lua-factory/sources/grl-guardianvideos.lua | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lua-factory/sources/grl-guardianvideos.lua b/src/lua-factory/sources/grl-guardianvideos.lua +index cf1cf16..282a898 100644 +--- a/src/lua-factory/sources/grl-guardianvideos.lua ++++ b/src/lua-factory/sources/grl-guardianvideos.lua +@@ -23,7 +23,7 @@ + -- Test the API at: + -- http://explorer.content.guardianapis.com/search?api-key=rppwmmu3mfqj6gkbs8kcjg23&show-fields=all&page-size=50&tag=type/video + API_KEY = 'rppwmmu3mfqj6gkbs8kcjg23' +-GUARDIANVIDEOS_URL = 'http://content.guardianapis.com/search?tag=type/video&page=%s&page-size=%s&show-fields=all&api-key=%s' ++GUARDIANVIDEOS_URL = 'http://content.guardianapis.com/search?tag=type/video&page=%d&page-size=%d&show-fields=all&api-key=%s' + + --------------------------- + -- Source initialization -- +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index 871d921..bcc6a6c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,3 @@ +0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch +0001-guardianvideos-fix-URL-format-string.patch video_sanitise_string-crash.patch -- 2.6.2 >From 78503e467e99badba2c4e39525f7a4c56819340b Mon Sep 17 00:00:00 2001 From: Tim Lunn <[email protected]> Date: Sat, 21 Nov 2015 15:44:09 +1100 Subject: [PATCH 3/3] Disable bliptv plugin this service has been shutdown (Closes: #799791) --- debian/changelog | 1 + debian/grilo-plugins-0.2-base.install | 1 - debian/rules | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index dad4d29..3eba97c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ grilo-plugins (0.2.14-6) UNRELEASED; urgency=low formatted as integers. - 0001-grl-bookmarks-Notify-about-a-removal-if-there-was-no.patch: Take patch from upstream bug to fix notification of deletions. + * Disable bliptv plugin this service has been shutdown (Closes: #799791) -- Tim Lunn <[email protected]> Sat, 21 Nov 2015 15:04:20 +1100 diff --git a/debian/grilo-plugins-0.2-base.install b/debian/grilo-plugins-0.2-base.install index b439baa..1c56e5c 100644 --- a/debian/grilo-plugins-0.2-base.install +++ b/debian/grilo-plugins-0.2-base.install @@ -1,5 +1,4 @@ /usr/lib/*/grilo-0.2/*apple*trailers* -/usr/lib/*/grilo-0.2/*bliptv* /usr/lib/*/grilo-0.2/*bookmarks* /usr/lib/*/grilo-0.2/*filesystem* /usr/lib/*/grilo-0.2/*gravatar* diff --git a/debian/rules b/debian/rules index bcdbcfe..8fcffbd 100755 --- a/debian/rules +++ b/debian/rules @@ -6,7 +6,8 @@ export HOME=/tmp dh $@ --with autoreconf --parallel override_dh_auto_configure: - dh_auto_configure -- --disable-silent-rules + dh_auto_configure -- --disable-silent-rules \ + --disable-bliptv override_dh_auto_install: dh_auto_install --destdir=debian/tmp -- 2.6.2
