[Pkg-gstreamer-commits] [SCM] GStreamer FFmpeg plugin 0.10 Packaging branch, master, updated. debian/0.10.13-2-1-g5d8f655

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 5d8f655b962de204de8bc4127d2d94dd9cd83650
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Fri Mar 30 09:53:59 2012 +0200

    * debian/control: Remove libavcodec53 conflicts with the Debian Multimedia version as the official Debian version now has the same epoch and we can't reliably conflict with the DM version anymore

diff --git a/debian/changelog b/debian/changelog
index 339a80b..f6461f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gstreamer0.10-ffmpeg (0.10.13-3) unstable; urgency=low
+
+  * debian/control:
+    + Remove libavcodec53 conflicts with the Debian Multimedia version
+      as the official Debian version now has the same epoch and we can't
+      reliably conflict with the DM version anymore.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 30 Mar 2012 09:53:06 +0200
+
 gstreamer0.10-ffmpeg (0.10.13-2) unstable; urgency=low
 
   * debian/patches/50_audio-get-buffer.patch:
diff --git a/debian/control b/debian/control
index defb938..0038e76 100644
--- a/debian/control
+++ b/debian/control
@@ -28,8 +28,7 @@ Package: gstreamer0.10-ffmpeg
 Architecture: any
 Section: libs
 Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libavcodec53 (<< 5:0) | libavcodec-extra-53 (<< 5:0)
+         ${shlibs:Depends}
 XB-GStreamer-Version: ${gstreamer:Version}
 XB-GStreamer-Elements: ${gstreamer:Elements}
 XB-GStreamer-URI-Sources: ${gstreamer:URISources}

-- 
GStreamer FFmpeg plugin 0.10 Packaging