[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 678e3d98cdfcf5472a8811d0cb19fe50d46fb3bb
Merge: 502fc1809d98d47ec4bc1f4553871a91056fc960 141ca8c761c72939bc23245fa51341b99c2ff483
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 15:07:20 2009 +0100

    Merge branch 'master' into ubuntu.jaunty

diff --combined debian/changelog
index 8315edd,d977d12..a415860
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,11 +1,18 @@@
 +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)
    * update Vcs-Git tags. Packaging has now moved to git
-   
+   * updates to packaging that faciliate building the unstripped and ubuntu
+     variants of this package
+   * enable xvmc support
+ 
    Upstream Changes:
     - SVQ3 watermark decoding support
     - hybrid WavPack support
@@@ -32,16 -28,6 +35,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
  
   -- 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)
@@@ -51,31 -37,6 +54,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).
diff --combined debian/control
index e658bf4,312a89e..7f06bd6
--- a/debian/control
+++ b/debian/control
@@@ -13,6 -13,7 +13,6 @@@ Homepage: http://ffmpeg.mplayerhq.hu
  Build-Depends-Indep: doxygen
  Build-Depends: debhelper (>= 5.0.0),
                 libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 -               libfaad-dev | libfaad2-dev,
                 libfreetype6-dev,
                 libgsm1-dev,
                 libimlib2-dev,
@@@ -23,6 -24,7 +23,7 @@@
                 libvorbis-dev,
                 libx11-dev,
                 libxext-dev,
+                libxvmc-dev,
                 quilt,
                 texi2html,
                 zlib1g-dev
diff --combined debian/control.ffmpeg-debian
index dd52d17,00e9881..4973d2b
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@@ -1,5 -1,6 +1,5 @@@
  Build-Depends: debhelper (>= 5.0.0),
                 libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 -               libfaad-dev | libfaad2-dev,
                 libfreetype6-dev,
                 libgsm1-dev,
                 libimlib2-dev,
@@@ -10,6 -11,7 +10,7 @@@
                 libvorbis-dev,
                 libx11-dev,
                 libxext-dev,
+                libxvmc-dev,
                 quilt,
                 texi2html,
                 zlib1g-dev

-- 
FFmpeg packaging