[SCM] FFmpeg packaging branch, ubuntu.karmic, updated. debian/0.5+svn20090706-1ubuntu2-2-g48d1a40

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.karmic branch:
commit 775d37c60232cd18e4a8dfdcaca1a0d8c2ed3e55
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Aug 19 21:52:44 2009 +0200

    finalize changelog for real upload

diff --git a/debian/changelog b/debian/changelog
index 66e6f30..8757582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,21 +1,11 @@
-ffmpeg (4:0.5+svn20090706-1ubuntu1~ppa2) karmic; urgency=low
-
-  * change shlibs file to make applications depend on the -extra- packages
-
- -- Reinhard Tartler <siretart at tauware.de>  Wed, 19 Aug 2009 19:11:07 +0200
-
-ffmpeg (4:0.5+svn20090706-1ubuntu1~ppa1) karmic; urgency=low
-
-  * motumedia test upload
-
- -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Aug 2009 18:22:09 +0200
-
 ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low
 
   * merge from debian. Remaining changes:
     - don't build-depend on libfaad-dev, disabling faad decoder.
     - build arm vfp variant
     - don't build libopenjpeg support (not in main)
+  * change shlibs file to make applications depend on the -extra- packages.
+  * don't build depend on yasm.
 
  -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Aug 2009 18:18:23 +0200
 

-- 
FFmpeg packaging