[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-3-13-g4d0dd68

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4d0dd689bb1cf2c2604730df3d111de200215321
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jun 3 14:08:37 2010 +0200

    fix debian/control file

diff --git a/debian/control b/debian/control
index 4cd67dd..fd00b49 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,8 @@ Build-Depends: debhelper (>= 7),
 
 Package: ffmpeg
 Section: video
-Replaces: libavcodec52 (<< 4:0.5.2-1) | libavcodec-extra-52 (<< 4:0.5.1-3)
+Replaces: libavcodec52 (<< 4:0.5.2-1),
+          libavcodec-extra-52 (<< 4:0.5.1-3)
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends}

-- 
FFmpeg packaging