diff -pruN 0.5.0-1/debian/changelog 0.5.0-1ubuntu1/debian/changelog --- 0.5.0-1/debian/changelog 2019-08-13 09:11:34.000000000 +0000 +++ 0.5.0-1ubuntu1/debian/changelog 2019-08-13 11:30:12.000000000 +0000 @@ -1,3 +1,11 @@ +gnome-video-effects (0.5.0-1ubuntu1) eoan; urgency=medium + + * Merge with Debian, remaining Ubuntu changes: + - Split gnome-video-effects that require the "bad" gstreamer plugins + into a separate package: gnome-video-effects-extra. + + -- Sebastien Bacher Tue, 13 Aug 2019 13:29:52 +0200 + gnome-video-effects (0.5.0-1) unstable; urgency=medium * New upstream version diff -pruN 0.5.0-1/debian/control 0.5.0-1ubuntu1/debian/control --- 0.5.0-1/debian/control 2019-08-13 09:11:34.000000000 +0000 +++ 0.5.0-1ubuntu1/debian/control 2019-08-13 11:30:44.000000000 +0000 @@ -5,7 +5,8 @@ Source: gnome-video-effects Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Emilio Pozuelo Monfort , Jeremy Bicha , Laurent Bigonville Build-Depends: debhelper-compat (= 12), gnome-pkg-tools (>= 0.11), @@ -19,9 +20,9 @@ Homepage: https://wiki.gnome.org/Project Package: gnome-video-effects Architecture: all Depends: ${misc:Depends}, - gstreamer1.0-plugins-good, - gstreamer1.0-plugins-bad -Suggests: gnome-video-effects-frei0r + gstreamer1.0-plugins-good +Suggests: gnome-video-effects-extra, + gnome-video-effects-frei0r Description: Collection of GStreamer effects gnome-video-effects contains a collection of GStreamer effects to be used in GNOME. @@ -31,13 +32,27 @@ Section: devel Architecture: all Depends: gnome-video-effects (= ${binary:Version}), ${misc:Depends} -Suggests: gnome-video-effects-frei0r (= ${binary:Version}) +Suggests: gnome-video-effects-extra (= ${binary:Version}), + gnome-video-effects-frei0r (= ${binary:Version}) Description: Development files for gnome-video-effects gnome-video-effects contains a collection of GStreamer effects to be used in GNOME. . This package contains the development files. +Package: gnome-video-effects-extra +Architecture: all +Depends: ${misc:Depends}, + gstreamer1.0-plugins-good, + gstreamer1.0-plugins-bad +Breaks: gnome-video-effects (<< 0.4.0-1ubuntu3~) +Replaces: gnome-video-effects (<< 0.4.0-1ubuntu3~) +Description: GNOME Video Effects - extra plugins + gnome-video-effects contains a collection of GStreamer effects to be + used in GNOME. + . + This package requires the "bad" gstreamer plugins. + Package: gnome-video-effects-frei0r Architecture: all Depends: ${misc:Depends}, diff -pruN 0.5.0-1/debian/control.in 0.5.0-1ubuntu1/debian/control.in --- 0.5.0-1/debian/control.in 2019-08-13 09:11:34.000000000 +0000 +++ 0.5.0-1ubuntu1/debian/control.in 2019-08-13 11:30:44.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-video-effects Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 12), gnome-pkg-tools (>= 0.11), @@ -15,9 +16,9 @@ Homepage: https://wiki.gnome.org/Project Package: gnome-video-effects Architecture: all Depends: ${misc:Depends}, - gstreamer1.0-plugins-good, - gstreamer1.0-plugins-bad -Suggests: gnome-video-effects-frei0r + gstreamer1.0-plugins-good +Suggests: gnome-video-effects-extra, + gnome-video-effects-frei0r Description: Collection of GStreamer effects gnome-video-effects contains a collection of GStreamer effects to be used in GNOME. @@ -27,13 +28,27 @@ Section: devel Architecture: all Depends: gnome-video-effects (= ${binary:Version}), ${misc:Depends} -Suggests: gnome-video-effects-frei0r (= ${binary:Version}) +Suggests: gnome-video-effects-extra (= ${binary:Version}), + gnome-video-effects-frei0r (= ${binary:Version}) Description: Development files for gnome-video-effects gnome-video-effects contains a collection of GStreamer effects to be used in GNOME. . This package contains the development files. +Package: gnome-video-effects-extra +Architecture: all +Depends: ${misc:Depends}, + gstreamer1.0-plugins-good, + gstreamer1.0-plugins-bad +Breaks: gnome-video-effects (<< 0.4.0-1ubuntu3~) +Replaces: gnome-video-effects (<< 0.4.0-1ubuntu3~) +Description: GNOME Video Effects - extra plugins + gnome-video-effects contains a collection of GStreamer effects to be + used in GNOME. + . + This package requires the "bad" gstreamer plugins. + Package: gnome-video-effects-frei0r Architecture: all Depends: ${misc:Depends}, diff -pruN 0.5.0-1/debian/gnome-video-effects-extra.install 0.5.0-1ubuntu1/debian/gnome-video-effects-extra.install --- 0.5.0-1/debian/gnome-video-effects-extra.install 1970-01-01 00:00:00.000000000 +0000 +++ 0.5.0-1ubuntu1/debian/gnome-video-effects-extra.install 2019-08-13 11:29:04.000000000 +0000 @@ -0,0 +1,10 @@ +usr/share/gnome-video-effects/bulge.effect +usr/share/gnome-video-effects/heat.effect +usr/share/gnome-video-effects/kaleidoscope.effect +usr/share/gnome-video-effects/mirror.effect +usr/share/gnome-video-effects/pinch.effect +usr/share/gnome-video-effects/sepia.effect +usr/share/gnome-video-effects/square.effect +usr/share/gnome-video-effects/stretch.effect +usr/share/gnome-video-effects/twirl.effect +usr/share/gnome-video-effects/xray.effect diff -pruN 0.5.0-1/debian/gnome-video-effects.install 0.5.0-1ubuntu1/debian/gnome-video-effects.install --- 0.5.0-1/debian/gnome-video-effects.install 2019-08-13 09:11:34.000000000 +0000 +++ 0.5.0-1ubuntu1/debian/gnome-video-effects.install 2019-08-13 11:29:04.000000000 +0000 @@ -1,27 +1,17 @@ -usr/share/gnome-video-effects/bulge.effect usr/share/gnome-video-effects/dicetv.effect usr/share/gnome-video-effects/edgetv.effect usr/share/gnome-video-effects/flip.effect -usr/share/gnome-video-effects/heat.effect usr/share/gnome-video-effects/historical.effect usr/share/gnome-video-effects/hulk.effect -usr/share/gnome-video-effects/kaleidoscope.effect usr/share/gnome-video-effects/mauve.effect -usr/share/gnome-video-effects/mirror.effect usr/share/gnome-video-effects/noir.effect usr/share/gnome-video-effects/optv.effect -usr/share/gnome-video-effects/pinch.effect usr/share/gnome-video-effects/quarktv.effect usr/share/gnome-video-effects/radioactv.effect usr/share/gnome-video-effects/revtv.effect usr/share/gnome-video-effects/ripple.effect usr/share/gnome-video-effects/saturation.effect -usr/share/gnome-video-effects/sepia.effect usr/share/gnome-video-effects/shagadelictv.effect -usr/share/gnome-video-effects/square.effect usr/share/gnome-video-effects/streaktv.effect -usr/share/gnome-video-effects/stretch.effect -usr/share/gnome-video-effects/twirl.effect usr/share/gnome-video-effects/vertigotv.effect usr/share/gnome-video-effects/warptv.effect -usr/share/gnome-video-effects/xray.effect