[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20090303-1ubuntu1.ppa1-54-gcbdb396

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit cbdb396ca969592dbb96d9aee1b6380bd4f65c66
Merge: c06408719e80b8d330b486ff3260d94c18d36e9b 29734a4aaf3089cdb3ce86c94977528b601a5570
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 21 14:30:44 2009 +0100

    merge from ubuntu.jaunty branch

diff --combined debian/changelog
index e556db9,e20bd3c..bdbf102
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,8 +1,14 @@@
- ffmpeg (3:0.svn20090303-1ubuntu1+unstripped1) jaunty; urgency=low
++ffmpeg (3:0.svn20090303-1ubuntu2+unstripped1) jaunty; urgency=low
 +
 +  * merge from ubuntu.jaunty branch
 +
-  -- Reinhard Tartler <siretart at tauware.de>  Fri, 13 Mar 2009 09:18:28 +0100
++ -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:30:03 +0100
++
+ ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
+ 
+   * don't disable ffserver in specialised flavors. Fixes LP: #345370
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:28:58 +0100
  
  ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
  
@@@ -52,24 -52,6 +58,24 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 22 Feb 2009 09:32:49 +0100
  
 +ffmpeg (3:0.svn20090204-2ubuntu1+unstripped3) jaunty; urgency=low
 +
 +  * add conflicts replaces for libavfilter0, LP: #322570
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 09 Mar 2009 18:24:56 +0100
 +
 +ffmpeg (3:0.svn20090204-2ubuntu1+unstripped2) jaunty; urgency=low
 +
 +  * add correct epoch in the "internal" shlibs generation
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 06 Feb 2009 15:24:58 +0100
 +
 +ffmpeg (3:0.svn20090204-2ubuntu1+unstripped1) jaunty; urgency=low
 +
 +  * rebuild using a clean, uncrippled ffmpeg tarball
 +
 + -- 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:
@@@ -127,21 -109,6 +133,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
@@@ -179,16 -146,6 +185,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.
@@@ -197,7 -154,7 +203,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