Import Debian changes 1.18.4-2.1

041f733a · Andreas Beckmann · Apertis CI robot · 931dffa8 · 041f733a · 041f733a
Commit 041f733a authored 3 years ago by Andreas Beckmann Committed by Apertis CI robot 3 years ago
--- a/debian/changelog
+++ b/debian/changelog
+gstreamer1.0 (1.18.4-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * libgstreamer1.0-dev: Add Conflicts: libgstreamer0.10-dev to ensure the
+    diverted file is gone before the diversion is removed.  (Closes: #990463)
+
+ -- Andreas Beckmann <anbe@debian.org>  Thu, 29 Jul 2021 16:51:28 +0200
+
 gstreamer1.0 (1.18.4-2) unstable; urgency=medium

  * Upload to unstable.

--- a/debian/control
+++ b/debian/control
@@ -65,7 +65,7 @@ Depends: libgstreamer1.0-0 (= ${binary:Version}),
         ${shlibs:Depends},
         ${misc:Depends},
         gir1.2-gstreamer-1.0 (= ${binary:Version})
-Conflicts: libgstreamer-plugins-bad1.0-dev (<< 1.13.1)
+Conflicts: libgstreamer-plugins-bad1.0-dev (<< 1.13.1), libgstreamer0.10-dev
 Replaces: libgstreamer-plugins-bad1.0-dev (<< 1.13.1)
 Suggests: gstreamer1.0-doc
 Description: GStreamer core development files