[SCM] FFmpeg packaging branch, ubuntu.jaunty, updated. debian/0.svn20081115-1ubuntu1-28-g678e3d9

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty branch:
commit df918b526f72da30d00e4b66142b6fff05c9dd84
Merge: 42c50e04ded40ab3ca7c3bc81f004b98b1d34350 2236cc3cfbbb61fbbc8fbba5f338402cba4d3396
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 09:18:26 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

diff --combined debian/changelog
index 9127520,5bd2db7..97ffd3c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,13 +1,13 @@@
- ffmpeg-debian (3:0.svn20090119-1) UNRELEASED; urgency=low
+ ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
  
-   * New Upstream Version (svn revision 16681m libswscale revision 28341)
+   * New Upstream Version (svn revision 16681 libswscale revision 28341)
    * update Vcs-Git tags. Packaging has now moved to git
    
    Upstream Changes:
     - SVQ3 watermark decoding support
     - hybrid WavPack support
  
-  -- Reinhard Tartler <siretart at tauware.de>  Mon, 12 Jan 2009 07:42:17 +0100
+  -- Reinhard Tartler <siretart at tauware.de>  Tue, 20 Jan 2009 00:55:26 +0100
  
  ffmpeg-debian (3:0.svn20090110-1) experimental; urgency=low
  
@@@ -25,16 -25,6 +25,16 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jan 2009 20:55:48 +0100
  
 +ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian.
 +  * keep myself in the maintainer field. If you are touching this or the
 +    'ffmpeg' package in multiverse, please get in touch with me. Both
 +    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
 +
  ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
  
    * new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -44,31 -34,6 +44,31 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 21:37:16 +0100
  
 +ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
 +
 +  * really disable faad support completely.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 10:58:01 +0100
 +
 +ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
 +
 +  * drop the patch to dlopen faad at runtime for now. it needs more
 +    polishing, and we can have that functionality easier with the 'ffmpeg'
 +    source package that will appear in multiverse.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 10:31:47 +0100
 +
 +ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
 +
 +  * merge from debian.
 +  * keep myself in the maintainer field. If you are touching this or the
 +    'ffmpeg' package in multiverse, please get in touch with me. Both
 +    source packages come from the same packaging branch.
 +  * drop dependency on faad.
 +  * import patches from old packaging to dlopen libfaad at runtime.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 10 Nov 2008 07:31:16 +0100
 +
  ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
  
    * upstream svn snapshot (svn revision 15786, libswscale revision 27900).

-- 
FFmpeg packaging