Bug#995166: Lower gst-plugins-bad to a suggests on Ubuntu

2021-09-27 Thread Alberto Garcia 
Control: tags -1 pending

On Mon, Sep 27, 2021 at 01:34:15PM +0200, Sebastien Bacher wrote:

> The gstreamer-plugins-bad1.0 package has been promoted to a
> recommends recently in Debian unstable but the package is in
> universe in Ubuntu, the attached patch makes the depends being
> handled the same way as the libav one which should give the expected
> results.

Thanks, applied.

Berto

Bug#995166: Lower gst-plugins-bad to a suggests on Ubuntu

2021-09-27 Thread Sebastien Bacher 
Package: webkit2gtk
Version: 2.34.0-1
Severity: minor
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu impish ubuntu-patch

The gstreamer-plugins-bad1.0 package has been promoted to a recommends
recently in Debian unstable but the package is in universe in Ubuntu,
the attached patch makes the depends being handled the same way as the
libav one which should give the expected results.

Thanks,

diff -Nru webkit2gtk-2.34.0/debian/changelog webkit2gtk-2.34.0/debian/changelog
--- webkit2gtk-2.34.0/debian/changelog	2021-09-23 12:10:43.0 +0200
+++ webkit2gtk-2.34.0/debian/changelog	2021-09-27 13:27:41.0 +0200
@@ -1,3 +1,11 @@
+webkit2gtk (2.34.0-2) UNRELEASED; urgency=medium
+
+  * debian/control, debian/rules:
+- handle gstreamer1.0-plugins-bad with the same Ubuntu override than
+  libav, it's also in universe
+
+ -- Sebastien Bacher   Mon, 27 Sep 2021 13:27:41 +0200
+
 webkit2gtk (2.34.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru webkit2gtk-2.34.0/debian/control webkit2gtk-2.34.0/debian/control
--- webkit2gtk-2.34.0/debian/control	2021-09-23 12:10:43.0 +0200
+++ webkit2gtk-2.34.0/debian/control	2021-09-27 13:26:50.0 +0200
@@ -144,8 +144,7 @@
  ${bwrap:Depends},
  ${shlibs:Depends},
  ${misc:Depends}
-Recommends: gstreamer1.0-plugins-bad,
-gstreamer1.0-gl,
+Recommends: gstreamer1.0-gl,
 libgl1-mesa-dri,
 ${bwrap:Recommends},
 ${gst:Recommends}
diff -Nru webkit2gtk-2.34.0/debian/rules webkit2gtk-2.34.0/debian/rules
--- webkit2gtk-2.34.0/debian/rules	2021-09-23 12:10:43.0 +0200
+++ webkit2gtk-2.34.0/debian/rules	2021-09-27 13:27:36.0 +0200
@@ -93,11 +93,11 @@
 	EXTRA_CMAKE_ARGUMENTS += -DUSER_AGENT_BRANDING="Ubuntu"
 endif
 
-# gstreamer1.0-libav is not in Ubuntu "main"
+# gstreamer1.0-libav and gstreamer1.0-plugins-bad are not in Ubuntu "main"
 ifeq ($(shell dpkg-vendor --derives-from Ubuntu && echo yes),yes)
-	DH_GENCONTROL_ARGS += -Vgst:Suggests="gstreamer1.0-libav"
+	DH_GENCONTROL_ARGS += -Vgst:Suggests="gstreamer1.0-libav, gstreamer1.0-plugins-bad"
 else
-	DH_GENCONTROL_ARGS += -Vgst:Recommends="gstreamer1.0-libav"
+	DH_GENCONTROL_ARGS += -Vgst:Recommends="gstreamer1.0-libav, gstreamer1.0-plugins-bad"
 endif
 
 %: