[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20081115-1ubuntu1+unstripped1-95-ga12c50b

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit a12c50b8e6e3821c3b5cd5971eb19aa1d761f4d3
Merge: 4484aa0d569ddcdb86e1da858616399d0b70ec66 15e8beab9fc08533b040bb9eac0afd9abefcf56e
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Feb 5 21:45:46 2009 +0100

    Merge branch 'ubuntu.jaunty' into ubuntu.jaunty.unstripped

diff --combined debian/changelog
index ccf368d,25a1c7c..71e3b67
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,15 @@@
- ffmpeg (3:0.svn20090204-2unstripped1) experimental; urgency=low
++ffmpeg (3:0.svn20090204-2ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * rebuild using a clean, uncrippled ffmpeg tarball
 +
-  -- Reinhard Tartler <siretart at tauware.de>  Tue, 03 Feb 2009 09:23:00 +0100
++ -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Feb 2009 21:45:05 +0100
++
+ ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
+ 
+   * merge from debian. Remaining changes:
+     - don't build depend on libfaad-dev
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Feb 2009 21:22:01 +0100
  
  ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low
  
@@@ -54,21 -55,6 +61,21 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 19:54:27 +0100
  
 +ffmpeg (3:0.svn20090119-1ubuntu1+unstripped2) jaunty; urgency=low
 +
 +  * add conflicts/replaces on libavfilter0. LP: #323789
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 18:45:46 +0100
 +
 +ffmpeg (3:0.svn20090119-1ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * merge with the ubuntu.jaunty branch
 +  * reenable x264 LP: #303537
 +  * build against vdpau
 +  * enable xvmc support
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 20 Jan 2009 17:51:19 +0100
 +
  ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
  
    * merge from debian. LP: #318501
@@@ -106,16 -92,6 +113,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jan 2009 20:55:48 +0100
  
 +ffmpeg (3:0.svn20081115-1ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * build unstripped version for multiverse.
 +  * enable additional external libraries:
 +      - libmp3lame-dev
 +      - libfaac-dev
 +      - libxvidcore-dev
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 19:50:42 +0100
 +
  ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
  
    * merge from debian.
@@@ -124,7 -100,7 +131,7 @@@
      source packages come from the same packaging branch.
    * drop dependency on faad.
  
 - -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 19:44:29 +0100
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Nov 2008 19:50:19 +0100
  
  ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
  

-- 
FFmpeg packaging