[SCM] FFmpeg packaging branch, ubuntu.jaunty.unstripped, updated. debian/0.svn20090204-2ubuntu1+unstripped1-3-g880bbd3

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu.jaunty.unstripped branch:
commit 880bbd3a582b9e2d855ac2b2508cb1906c4d8242
Merge: a12c50b8e6e3821c3b5cd5971eb19aa1d761f4d3 44eb4246f61ca0eea2712bf1f1d3605f4be2718d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Fri Feb 6 15:25:20 2009 +0100

    add correct epoch in the "internal" shlibs generation

diff --combined debian/changelog
index 71e3b67,f98fc54..1fde8f9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,14 +1,21 @@@
 -ffmpeg (3:0.svn20090204-2unstripped2) experimental; urgency=low
++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 11:05:54 +0100
++ -- Reinhard Tartler <siretart at tauware.de>  Fri, 06 Feb 2009 15:24:58 +0100
+ 
 -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
  
@@@ -61,28 -60,6 +67,28 @@@ 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
 +  * new version fixes CVE-2008-3230, LP: #253767
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 20 Jan 2009 09:20:53 +0100
 +
  ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
  
    * New Upstream Version (svn revision 16681 libswscale revision 28341)
@@@ -113,26 -90,6 +119,26 @@@ 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.
 +  * 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:50:19 +0100
 +
  ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
  
    * new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -142,31 -99,6 +148,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