[SCM] libav/master: Fix up debian/changelog and get dependencies right accordingly.

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 596242b18dfee398fc557e06e45963b8c07390c8
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Sun Jul 15 10:14:21 2012 +0200

    Fix up debian/changelog and get dependencies right accordingly.

diff --git a/debian/changelog b/debian/changelog
index 65b7b47..ddb12c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
-libav (6:0.8.3-4) unstable; urgency=low
+libav (6:0.8.3-5) unstable; urgency=low
 
   [ Reinhard Tartler ]
-  * Declare a 'Breaks' relationship against mplayer, Closes: #671934
   * Bug fix: "Multi-Arch: foreign libraries", thanks to Stepan Golosunov.
     Drop the Multi-arch field on the transitional packages
     to avoid that the dependency can be satisfied by packages of other
@@ -14,6 +13,12 @@ libav (6:0.8.3-4) unstable; urgency=low
 
  -- Reinhard Tartler <siretart at tauware.de>  Mon, 09 Jul 2012 21:55:34 +0200
 
+libav (6:0.8.3-4) unstable; urgency=low
+
+  * Declare a 'Breaks' relationship against mplayer, Closes: #671934
+
+ -- Reinhard Tartler <siretart at tauware.de>  Tue, 26 Jun 2012 08:46:42 +0200
+
 libav (6:0.8.3-3) unstable; urgency=low
 
   * Install the shared flavor last; the binaries from the optimized flavor(s)
diff --git a/debian/control b/debian/control
index 20bb87b..189f416 100644
--- a/debian/control
+++ b/debian/control
@@ -64,8 +64,6 @@ Build-Depends:
 Package: libav-tools
 Section: video
 Architecture: any
-Provides:
- ffmpeg
 Replaces:
  ffmpeg (<< 4:0.8~),
  libavcodec-extra-53 (<< 4:0.6~),
@@ -123,17 +121,16 @@ Package: libav-dbg
 Section: debug
 Priority: extra
 Architecture: any
-Provides:
- ffmpeg-dbg
 Replaces:
- ffmpeg-dbg (<< 6:0.8.3-4),
- libav-regular-dbg (<< 6:0.8.3-4),
- libav-extra-dbg (<< 6:0.8.3-4)
+ ffmpeg-dbg (<< 6:0.8.3-5),
+ libav-regular-dbg (<< 6:0.8.3-5),
+ libav-extra-dbg (<< 6:0.8.3-5)
 Breaks:
- ffmpeg-dbg (<< 6:0.8.3-4),
- libav-regular-dbg (<< 6:0.8.3-4),
- libav-extra-dbg (<< 6:0.8.3-4)
+ ffmpeg-dbg (<< 6:0.8.3-5),
+ libav-regular-dbg (<< 6:0.8.3-5),
+ libav-extra-dbg (<< 6:0.8.3-5)
 Depends:
+ ffmpeg (= ${binary:Version}),
  libav-tools (= ${binary:Version}),
  libavcodec53 (= ${binary:Version}) | libavcodec-extra-53 (= ${binary:Version}),
  libavdevice53 (= ${binary:Version}),

-- 
Libav/FFmpeg packaging