[SCM] FFmpeg packaging branch, master, updated. debian/0.5.1-3-4-g4f58b03

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4f58b031aef85e5f3a0dfac12bbbf1d3ca9bb548
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue May 18 11:07:43 2010 +0200

    move presets back to 'ffmpeg' package. Closes #581748
    
    The problem is more serious at it seems. Leaving the presets in
    /usr/share/ffmpeg will cause file conflicts on the next SONAME bump. brr.
    
    This fix is actually more complicated as it seems. I proposed to change
    the installation directory to include the soname change. Hower, it did
    not receive good reception upstream:
    
    http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109433
    
    In the end, moving it back to the ffmpeg package seems to be the least
    evil here.

diff --git a/debian/ffmpeg.install b/debian/ffmpeg.install
index 8a656e2..98227ed 100644
--- a/debian/ffmpeg.install
+++ b/debian/ffmpeg.install
@@ -1,3 +1,4 @@
 etc
 usr/bin
 usr/share/man
+usr/share/ffmpeg/*.ffpreset
diff --git a/debian/libavcodec52.install b/debian/libavcodec52.install
index 40df581..db9ed34 100644
--- a/debian/libavcodec52.install
+++ b/debian/libavcodec52.install
@@ -1,2 +1 @@
 usr/lib/{,*/,*/*/}libavcodec.so.*
-usr/share/ffmpeg/*.ffpreset

-- 
FFmpeg packaging