[SCM] FFmpeg packaging branch, ubuntu.karmic.extra, updated. debian/0.5+svn20090706-2ubuntu1-18-g04af716

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.karmic.extra branch:
commit 04af716999b983b13ce2c1615c15e376ecfd1094
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Oct 14 09:16:12 2009 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 0f8dc33..2a972b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,14 @@
-ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) unstable; urgency=low
-
-  * prepare new upload
-  * merge from the 'ffmpeg' package
-
- -- Reinhard Tartler <siretart at tauware.de>  Wed, 14 Oct 2009 07:35:30 +0200
-
-ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
 
   [ Reinhard Tartler ]
+  * merge from the 'ffmpeg' package
   * Make arguments of av_set_pts_info() unsigned.
   * update debian/changelog
   * use patch for issue1245 from git.ffmpeg.org
   * Support constant-quant encoding for libtheora, LP: #356322
   * increase swscale compile time width (VOF/VOFW), LP: #443264
+  * Add missing Conflicts/Replaces to ensure a working upgrade patch from
+    intrepid/jaunty. LP: #418785
 
   [ Loïc Minier ]
   * Update config for karmic's armel toolchain.
@@ -22,7 +18,7 @@ ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
   * Pass proper --cpu and --extra-flags on armel.
   * Pass -fPIC -DPIC to neon pass.
 
- -- Loïc Minier <loic.minier at ubuntu.com>  Tue, 13 Oct 2009 23:56:04 +0200
+ -- Reinhard Tartler <siretart at tauware.de>  Wed, 14 Oct 2009 09:15:50 +0200
 
 ffmpeg-extra (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
 

-- 
FFmpeg packaging