[SCM] ffmpeg/ubuntu: Merge commit 'debian/4%0.6.2-1' into ubuntu

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Mar 20 09:26:23 UTC 2011


update debian/changelog
Introduce 'libav-source', which contains the patched sources of libav
make buildlogs verbose
Switch to libav packages
update version numbering
Merge branch 'upstream' (libav 0.6.2)
Imported Upstream version 0.6.2
rename source package to libav
prepare new upload
Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)
copy in changelog entries from the 0.5 packaging branch (Closes: #616190)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu
X-Git-Reftype: branch
X-Git-Oldrev: 2580768e5254fd8b62b7ed8bea2a9b91906689c6
X-Git-Newrev: 19a89fc4d7e9f745dd72dcd3bd2c3a55118afb40

The following commit has been merged in the ubuntu branch:
commit 68df93735602070fd013810399d50b4c301329db
Merge: 450bfc1e1c555e30acf07dec8aafe4f9f3d8b208 487ec5f84f54e4605afabb2886f7ef2e25e538f1
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Mar 19 22:25:30 2011 +0100

    Merge commit 'debian/4%0.6.2-1' into ubuntu

diff --combined debian/changelog
index 0f5dea8,82f9297..ab1085e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,21 +1,38 @@@
+ libav (4:0.6.2-1) unstable; urgency=medium
+ 
+   [ Reinhard Tartler ]
+   * Imported Upstream version 0.6.2
+     - include security fixes (Closes: #611495)
+   * rename source package to libav
+   * Switch to libav packages
+   * copy in changelog entries from the 0.5 packaging branch (Closes: #616190)
+   * update version numbering
+   * make buildlogs verbose
+   * Introduce 'libav-source', which contains the patched sources of libav
+   * rename source package to libav
+ 
+   [ Fabian Greffrath ]
+   * Fix cp of doxy documentation fails with "Argument list too long" (Closes: #618679)
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 19 Mar 2011 08:13:46 +0100
+ 
 +ffmpeg (4:0.6.1-5ubuntu2) natty; urgency=low
 +
 +  * Replace cp with tar to avoid an error of "/bin/cp: Argument list too long" on the ARM platform (running under a QEMU chroot environment) (LP: #734331)
 +    - Check on a Ubuntu "pbuilder" environment on Ubuntu 10.10/maverick x86
 +    - Restore a "Doxygen" file that excidentaly got into the changeset of the bug
 +
 + -- Gal Shalif <gal-fourier at trac>  Mon, 14 Mar 2011 13:47:24 +0200
 +
 +ffmpeg (4:0.6.1-5ubuntu1) natty; urgency=low
 +
 +  * Merge from debian. Remaining changes:
 +    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
 +    - explicitly --enable-pic on powerpc, cf. LP #654666
 +    - different arm configure bits that should probably better be merged into debian
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Feb 2011 20:04:06 +0100
 +
  ffmpeg (4:0.6.1-5) unstable; urgency=low
  
    * don't enable vaapi support on the hurd, Closes: #613034
@@@ -43,13 -44,6 +61,13 @@@ ffmpeg (4:0.6.1-3) unstable; urgency=lo
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 30 Jan 2011 09:22:11 +0100
  
 +ffmpeg (4:0.6.1-2ubuntu1) natty; urgency=low
 +
 +  * Merge from debian. Remaining changes:
 +    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 19 Nov 2010 12:05:43 +0100
 +
  ffmpeg (4:0.6.1-2) experimental; urgency=low
  
    [ Jonas Smedegaard ]
@@@ -63,15 -57,6 +81,15 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Fri, 19 Nov 2010 10:50:51 +0100
  
 +ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
 +
 +  * Merge from debian. Remaining changes:
 +    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
 +    - explicitly --enable-pic on powerpc, cf. LP: #654666
 +  * remove fix-CVE-2010-3429.patch, applied upstream
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 14 Nov 2010 12:19:50 +0100
 +
  ffmpeg (4:0.6.1-1) experimental; urgency=low
  
    * Imported Upstream version 0.6.1
@@@ -81,44 -66,6 +99,44 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 01 Nov 2010 09:18:08 +0100
  
 +ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
 +
 +  * fix dependency on libswscale-extra-0, LP: #637895
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 05 Oct 2010 21:25:53 +0200
 +
 +ffmpeg (4:0.6-2ubuntu5) maverick; urgency=low
 +
 +  * Add flic video patch. Fixes CVE-2010-3429
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 05 Oct 2010 21:11:41 +0200
 +
 +ffmpeg (4:0.6-2ubuntu4) maverick; urgency=low
 +
 +  * Configure with --enable-pic on powerpc. LP: #654666.
 +
 + -- Matthias Klose <doko at ubuntu.com>  Mon, 04 Oct 2010 19:39:46 +0200
 +
 +ffmpeg (4:0.6-2ubuntu3) maverick; urgency=low
 +
 +  * add libxfixes-dev to build-depends, LP: #631103
 +
 + -- Dominic Evans <oldmanuk at gmail.com>  Fri, 10 Sep 2010 14:21:23 +0100
 +
 +ffmpeg (4:0.6-2ubuntu2) maverick; urgency=low
 +
 +  * weaken the dependencies for the -extra package
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jul 2010 20:38:27 -0400
 +
 +ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sun, 11 Jul 2010 11:00:54 -0400
 +
  ffmpeg (4:0.6-2) experimental; urgency=low
  
    [ Fabian Greffrath ]
@@@ -144,18 -91,6 +162,18 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Tue, 29 Jun 2010 09:07:56 +0200
  
 +ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +  * new upstream release
 +    - internal vorbis encoder is disabled. LP: #585330
 +    - includes native AMR-NB decoder, LP: #93849
 +    - api-example is fixed: LP: #557319
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 12:53:24 +0200
 +
  ffmpeg (4:0.6-1) experimental; urgency=low
  
    * new upstream release
@@@ -165,21 -100,6 +183,21 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Wed, 16 Jun 2010 09:25:28 +0200
  
 +ffmpeg (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
 +
 +  * add proper replaces, fixes: LP: #587369
 +  * fix typo in dependency on libavfilter-extra-1. LP: #587431
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 03 Jun 2010 11:33:32 +0200
 +
 +ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
 +
 +  * merge from debian/experimental. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 May 2010 00:01:17 +0200
 +
  ffmpeg (4:0.6~svn20100505-1) experimental; urgency=low
  
    * update to new upstream. Closes: #569727
@@@ -197,14 -117,83 +215,91 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 24 Jan 2010 21:24:56 +0100
  
+ ffmpeg (4:0.5.2-6) unstable; urgency=high
+ 
+   * Fix several security issues in flicvideo.c.
+     Fixes: CVE-2010-3429, Closes: #598590
+   * Raising severity to high because of security issue.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 03 Oct 2010 16:59:39 +0200
+ 
+ ffmpeg (4:0.5.2-5) unstable; urgency=low
+ 
+   [ Dominic Evans ]
+   * add libxfixes-dev to build-depends to unbreak x11grab input,
+     Closes: #596342, LP: #631103
+   
+   [ Reinhard Tartler ]
+   * fix x11grab example in e.g. the manpage so that they actually work
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 13 Sep 2010 15:29:49 +0200
+ 
+ ffmpeg (4:0.5.2-4) unstable; urgency=low
+ 
+   [ Loïc Minier ]
+   * Fix typo: use -march=armv7-a instead of -marmv7-a
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Tue, 31 Aug 2010 15:31:05 +0200
+ 
+ ffmpeg (4:0.5.2-3) unstable; urgency=low
+ 
+   [ Reinhard Tartler ]
+   * Move breaks declaration from libavformat to libavcodec to help the
+     apt solver, Closes: #591881
+ 
+   [ Loïc Minier ]
+     debian/confflags: detect whether the toolchain supports ARMv7 ("dmb")
+     by default as the NEON pass needs at least ARMv6t2; if it's not enabled by
+     default, pass -marmv7-a in extra-cflags for the NEON pass since NEON
+     implies ARMv7; closes: #594417.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Fri, 27 Aug 2010 01:24:10 +0200
+ 
+ ffmpeg (4:0.5.2-2) unstable; urgency=low
+ 
+   * Enable some encoders:
+     - h263, h263p, mpeg2video, mpeg4, msmpeg4v1, msmpeg4v2, msmpeg4v3
+     Closes: #418231, #433287, #440216, #587898, #525349
+   * Bump Standards Version, no changes needed
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Aug 2010 11:59:26 -0400
+ 
+ ffmpeg (4:0.5.2-1) unstable; urgency=low
+ 
+   [ Andres Mejia ]
+   * Fix dependency problem for ffmpeg so it can use extra ffmpeg libs.
+ 
+   [ Reinhard Tartler ]
+   * move presets back to 'ffmpeg' package. Closes: #581748
+ 
+   [ Fabian Greffrath ]
+   * Imported Upstream version 0.5.2
+   * Remove ffmpeg-debian_hurd.patch, applied upstream.
+   * Remove fix-ftbfs-altivec.patch, applied upstream.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 May 2010 23:01:08 +0200
+ 
+ ffmpeg (4:0.5.1-3) unstable; urgency=low
+ 
+   * fix ftbfs on powerpc
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Fri, 12 Mar 2010 21:43:55 +0100
+ 
+ ffmpeg (4:0.5.1-2) unstable; urgency=low
+ 
+   * reintroduce gnu/hurd patch
+   * Fix compilation on powerpc with --disable-altivec
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Wed, 10 Mar 2010 21:19:40 +0100
+ 
 +ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
 +
 +  * merge from debian. remaining changes:
 +    - don't disable encoders
 +    - don't build against libfaad, libdirac and libopenjpeg (all in universe)
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 04 Mar 2010 10:34:37 +0100
 +
  ffmpeg (4:0.5.1-1) unstable; urgency=low
  
    * new upstream release:
@@@ -235,25 -224,6 +330,25 @@@ ffmpeg (4:0.5+svn20090706-6) unstable; 
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 31 Jan 2010 16:53:47 +0100
  
 +ffmpeg (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
 +
 +  * tighten build dependency on new x264 package
 +  * add x264 backport for ffmpeg 0.5
 +  * install presets in 'libavcodec package' instead of 'ffmpeg' binary,
 +    see git history for rationale of this change
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 17 Feb 2010 08:37:17 +0100
 +
 +ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
 +
 +  * merge from debian, remaining changes:
 +    - dont disable internal encoders
 +    - disabled extra depedencies (come with ffmpeg-extra)
 +       - libdirac
 +       - libopenjpeg
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 16 Jan 2010 10:12:15 +0100
 +
  ffmpeg (4:0.5+svn20090706-5) unstable; urgency=medium
  
    * Upload to unstable
@@@ -280,7 -250,10 +375,7 @@@ ffmpeg (4:0.5+svn20090706-4) experiment
      --enable-armvfp on ARM since the upstream configure script will do the
      right thing when the proper flags are set.
  
 -  [ Reinhard Tartler ]
 -  * build with PIC on powerpc (Closes: #561956)
 -
 - -- Reinhard Tartler <siretart at tauware.de>  Fri, 15 Jan 2010 21:46:49 +0100
 + -- Loïc Minier <lool at dooz.org>  Wed, 13 Jan 2010 12:57:32 +0100
  
  ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
  
@@@ -325,73 -298,6 +420,73 @@@
    * make sure the ${misc:Depends} substvar is used for each binary package
  
   -- Reinhard Tartler <siretart at tauware.de>  Wed, 06 Jan 2010 16:27:40 +0100
 +  
 +ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low
 +
 +  * export *all* symbols of libswscale, fixes FTBFS in mplayer
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 02 Jan 2010 23:37:21 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
 +
 +  * Imported Debian patch 0.5+svn20090706-2ubuntu4
 +  * revert gbp.conf to point to lucid branch
 +  * enable symbol versioning
 +  * bump shlibs version
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 02 Jan 2010 15:03:09 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
 +
 +  * add build dependency on 'yasm', since it is now moved to main.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Mon, 21 Dec 2009 23:57:34 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
 +
 +  * security backports from ffmpeg trunk (Closes: #550442)
 +   - libavcodec/mpegaudiodec
 +   - libavcodec/vorbis_dec
 +   - libavcodec/ffv1
 +   - libavcodec/vp3
 +   - libavcodec/h264
 +   - libavformat/mov
 +   - libavformat/oggdec
 +   - libavformat/oggparsevorbis
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 05 Nov 2009 20:31:29 +0100
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
 +
 +  [ Reinhard Tartler ]
 +  * Make arguments of av_set_pts_info() unsigned.
 +  * update debian/changelog
 +  * use patch for issue1245 from git.ffmpeg.org
 +  * Support constant-quant encoding for libtheora, LP: #356322
 +  * increase swscale compile time width (VOF/VOFW), LP: #443264
 +
 +  [ Loïc Minier ]
 +  * Update config for karmic's armel toolchain.
 +  * Enable neon flavour; LP: #383240.
 +  * Update NEON confflags to assume v7 and VFP.
 +  * Add backported NEON patches from ffmpeg trunk; see debian/patches/neon/.
 +  * Pass proper --cpu and --extra-flags on armel.
 +  * Pass -fPIC -DPIC to neon pass.
 +
 + -- Loïc Minier <loic.minier at ubuntu.com>  Tue, 13 Oct 2009 23:56:04 +0200
 +
 +ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - disabled output decoders: faad, openjpeg, dirac (all not in main)
 +    - build arm vfp variant
 +    - don't build depend on yasm.
 +  * fix dependencies on -extra packages: LP: #418705, #416348
 +  * no need to remove mpeg encoders in the ubuntu package, unless we hear
 +    otherwise from some patent owner. This brings back the mpeg2video
 +    encoder is available. cf. formats.txt.gz LP: #416585
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 Aug 2009 11:20:03 +0200
  
  ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low
  
@@@ -408,30 -314,6 +503,30 @@@
  
   -- Reinhard Tartler <siretart at tauware.de>  Wed, 26 Aug 2009 09:12:49 +0200
  
 +ffmpeg (4:0.5+svn20090706-1ubuntu3) karmic; urgency=low
 +
 +  * update the dependencies of the -dev packages for the
 +    unstripped -> extra renaming
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 Aug 2009 16:37:23 +0200
 +
 +ffmpeg (4:0.5+svn20090706-1ubuntu2) karmic; urgency=low
 +
 +  * really drop libopenjpeg from build depends.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Tue, 25 Aug 2009 08:17:17 +0200
 +
 +ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - don't build-depend on libfaad-dev, disabling faad decoder.
 +    - build arm vfp variant
 +    - don't build libopenjpeg support (not in main)
 +  * change shlibs file to make applications depend on the -extra- packages.
 +  * don't build depend on yasm.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 15 Aug 2009 18:18:23 +0200
 +
  ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
  
    * preparing new upstream version, 0.5 release branch, rev 19352
@@@ -492,31 -374,6 +587,31 @@@ ffmpeg-debian (4:0.5+svn20090609-2) uns
  
   -- Reinhard Tartler <siretart at tauware.de>  Thu, 13 Aug 2009 12:46:46 +0200
  
 +ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low
 +
 +  * do not forcefully enable objenjpeg, it is not avaiable in this build
 +    anyway
 +  * don't build against faac in any case, it is deemed non-free
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Jul 2009 09:15:12 +0200
 +
 +ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low
 +
 +  * remove libopenjpeg-dev from build depends (fixes FTBFS)
 +  * remove duplicate libxvmc-dev build-dependency
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 24 Jul 2009 21:53:47 +0200
 +
 +ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
 +
 +  * merge from debian. Remaining changes:
 +    - don't build-depend on libfaad-dev, disabling faad decoder.
 +    - build arm vfp variant
 +  * update gbp.conf
 +  * move gbp.conf to debian/
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 18 Jul 2009 10:55:24 +0200
 +
  ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
  
    [ Andres Mejia ]
@@@ -631,49 -488,6 +726,49 @@@ ffmpeg-debian (4:0.5+svn20090420-1) uns
    
   -- Reinhard Tartler <siretart at tauware.de>  Sat, 02 May 2009 09:09:54 +0200
  
 +ffmpeg-debian (3:0.svn20090303-1ubuntu6) jaunty; urgency=low
 +
 +  * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp".
 +
 + -- Loic Minier <lool at dooz.org>  Fri, 10 Apr 2009 21:34:29 +0200
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu5) jaunty; urgency=low
 +
 +  * Disable more autodetected ARM arch features.
 +  * Add neon and vfp flavors to armel disabled for now.
 +  * Enable vfp pass on armel; leave the neon disabled.
 +
 + -- Loïc Minier <lool at dooz.org>  Fri, 10 Apr 2009 17:58:52 +0200
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu4) jaunty; urgency=low
 +
 +  * brown paperbag upload. Actually include the patch intended for the
 +    last upload.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:55:46 +0100
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu3) jaunty; urgency=low
 +
 +  * don't disable ffserver in specialised flavors. Fixes LP: #345370
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 21 Mar 2009 14:52:25 +0100
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
 +
 +  * No-change rebuild to fix lpia shared library dependencies.
 +
 + -- Colin Watson <cjwatson at ubuntu.com>  Thu, 19 Mar 2009 17:26:36 +0000
 +
 +ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
 +
 +  * FFE granted in LP: #340303.
 +
 +  * merge from debian/unstable.
 +  * remaining changes to debian:
 +    - don't build-depend on libfaad-dev, disabling faad decoder.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Fri, 13 Mar 2009 08:54:33 +0100
 +
  ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
  
    * New Upstream Version (svn revision 17737 libswscale revision 28799)
@@@ -712,13 -526,6 +807,13 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 22 Feb 2009 09:32:49 +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
  
    * add libxvmc-dev to build-depends in the 'ffmpeg' variant
@@@ -769,13 -576,6 +864,13 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 01 Feb 2009 19:54:27 +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)
@@@ -806,16 -606,6 +901,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)
@@@ -825,31 -615,6 +920,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 09abd01,f3880e0..cdc2e60
--- a/debian/control
+++ b/debian/control
@@@ -1,8 -1,7 +1,8 @@@
- Source: ffmpeg
+ Source: libav
  Section: libs
  Priority: optional
 -Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
 +XSBC-Original-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
  Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
   Loic Minier <lool at dooz.org>,
   Reinhard Tartler <siretart at tauware.de>,
@@@ -19,10 -18,14 +19,10 @@@ Build-Depends: debhelper (>= 7)
   libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libbz2-dev,
   libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
   libfreetype6-dev,
   libgsm1-dev,
   libimlib2-dev,
 - libopenjpeg-dev,
   libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
 - librtmp-dev (>= 2.2e-4),
   libschroedinger-dev,
   libsdl1.2-dev,
   libspeex-dev,
@@@ -58,6 -61,22 +58,22 @@@ Package: ffmpeg-db
  Section: debug
  Priority: extra
  Architecture: any
+ Depends: libav-dbg
+ Breaks: libav-dbg (<< ${binary:Version})
+ Replaces: libav-dbg (<< ${binary:Version})
+ Description: Debug symbols for Libav related packages
+  This package contains debug data of the Libav related shared libraries.
+  .
+  Most people will not need this package. Please install it to produce useful
+  stacktraces to help debugging the Libav libraries.
+  .
+  This package is only used for transitional purposes and can be safely
+  removed.
+ 
+ Package: libav-dbg
+ Section: debug
+ Priority: extra
+ Architecture: any
  Depends: libavutil50 (= ${binary:Version}),
   libavcodec52 (= ${binary:Version}),
   libavdevice52 (= ${binary:Version}),
@@@ -66,18 -85,42 +82,42 @@@
   libswscale0 (= ${binary:Version}),
   ffmpeg (= ${binary:Version}),
   ${misc:Depends}
- Description: Debug symbols for FFmpeg related packages
-  This package contains debug data of the ffmpeg related shared libraries.
+ Description: Debug symbols for Libav related packages
+  This package contains debug data of the Libav related shared libraries.
   .
   Most people will not need this package. Please install it to produce useful
-  stacktraces to help debugging the ffmpeg library.
+  stacktraces to help debugging the Libav library.
+ 
+ Package: libav-source
+ Architecture: all
+ Section: devel
+ Description: Patched Libav sources
+  This package contains a tarball the source file that were used to produce
+  this package, containing all modifications that have been applied inline.
+  .
+  This package is used as build-dependency for 'libav-extra', which provides
+  the "extra" variants of libav.
  
  Package: ffmpeg-doc
  Section: doc
  Architecture: all
+ Depends: libav-doc
+ Description: Documentation of the Libav API (transitional package)
+  This package contains the html doxygen documentation of the Libav API.
+  .
+  Only application developers will find this package useful.
+  .
+  This package is only used for transitional purposes and can be safely
+  removed.
+ 
+ Package: libav-doc
+ Section: doc
+ Architecture: all
  Depends: ${misc:Depends}
- Description: Documentation of the FFmpeg API
-  This package contains the html doxygen documentation of the FFmpeg API.
+ Breaks: ffmpeg-doc (<< ${binary:Version})
+ Replaces: ffmpeg-doc (<< ${binary:Version})
+ Description: Documentation of the Libav API
+  This package contains the html doxygen documentation of the Libav API.
   .
   Only application developers will find this package useful.
  
@@@ -85,8 -128,8 +125,8 @@@ Package: libavutil5
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
- Description: FFmpeg utility library
-  This is the common utility library from FFmpeg. It contains shared code
+ Description: Libav utility library
+  This is the common utility library from Libav. It contains shared code
   used by all other ffmpeg libraries.
  
  Package: libavcodec52
@@@ -94,8 -137,8 +134,8 @@@ Architecture: an
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Breaks: libavcodec51 (<< 3:0.svn20090303-1)
- Description: FFmpeg codec library
-  This is the codec library from FFmpeg (both encoding and decoding).
+ Description: Libav codec library
+  This is the codec library from Libav (both encoding and decoding).
   .
   It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
  
@@@ -103,16 -146,16 +143,16 @@@ Package: libavdevice5
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
- Description: FFmpeg device handling library
-  This is the device handling library from FFmpeg.
+ Description: Libav device handling library
+  This is the device handling library from Libav.
  
  Package: libavformat52
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
- Description: FFmpeg file format library
-  This is the library for handling file formats from FFmpeg.
+ Description: Libav file format library
+  This is the library for handling file formats from Libav.
   .
   It supports most existing file formats (AVI, MPEG, OGG, Matroska,
   ASF...).
@@@ -121,23 -164,23 +161,23 @@@ Package: libavfilter
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
- Description: FFmpeg video filtering library
-  This is the video filtering library from FFmpeg.
+ Description: Libav video filtering library
+  This is the video filtering library from Libav.
  
  Package: libpostproc51
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
- Description: FFmpeg video postprocessing library
-  This is the video postprocessing library from FFmpeg.
+ Description: Libav video postprocessing library
+  This is the video postprocessing library from Libav.
  
  Package: libswscale0
  Architecture: any
  Depends: ${shlibs:Depends},
   ${misc:Depends}
  Breaks: mplayer (<< 2:1.0~rc4~), mplayer-gui (<< 2:1.0~rc4~)
- Description: FFmpeg video scaling library
-  This is the video software scaling library from FFmpeg.
+ Description: Libav video scaling library
+  This is the video software scaling library from Libav.
  
  Package: libavutil-dev
  Section: libdevel
@@@ -146,7 -189,7 +186,7 @@@ Depends: libavutil50 (>= ${binary:Versi
   libavutil50 (<= ${source:Upstream-Version}-99) | libavutil-extra-50 (<= ${source:Upstream-Version}-99),
   ${misc:Depends}
  Description: Development files for libavutil
-  This is the common utility library from FFmpeg.
+  This is the common utility library from Libav.
   .
   This package contains the header files and static libraries needed to
   compile applications or shared objects that use libavutil.
@@@ -170,7 -213,7 +210,7 @@@ Suggests: libfaad-dev
   zlib1g-dev,
   ${lib1394-dev}
  Description: Development files for libavcodec
-  This is the codec library from FFmpeg. It supports most existing
+  This is the codec library from Libav. It supports most existing
   encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
   .
   This package contains the header files and static libraries needed to
@@@ -184,7 -227,7 +224,7 @@@ Depends: libavdevice52 (>= ${binary:Ver
   libavformat-dev (= ${binary:Version}),
   ${misc:Depends}
  Description: Development files for libavdevice
-  This is the device handling library from FFmpeg.
+  This is the device handling library from Libav.
   .
   This package contains the header files and static libraries needed to
   compile applications or shared objects that use libavdevice.
@@@ -197,7 -240,7 +237,7 @@@ Depends: libavformat52 (>= ${binary:Ver
   libavcodec-dev (= ${binary:Version}),
   ${misc:Depends}
  Description: Development files for libavformat
-  This is the demuxer library from FFmpeg. It supports most
+  This is the demuxer library from Libav. It supports most
   existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
   .
   This package contains the header files and static libraries needed to
@@@ -211,7 -254,7 +251,7 @@@ Depends: libavfilter1 (>= ${binary:Vers
   libavcodec-dev (= ${binary:Version}),
   ${misc:Depends}
  Description: Development files for libavfilter
-  This is the video filtering library from FFmpeg.
+  This is the video filtering library from Libav.
   .
   This package contains the header files and static libraries needed to
   compile applications or shared objects that use libavfilter.
@@@ -224,7 -267,7 +264,7 @@@ Depends: libpostproc51 (>= ${binary:Ver
   libavutil-dev (= ${binary:Version}),
   ${misc:Depends}
  Description: Development files for libpostproc
-  This is the video postprocessing library from FFmpeg.
+  This is the video postprocessing library from Libav.
   .
   This package contains the header files and static libraries needed to
   compile applications or shared objects that use libpostproc.
@@@ -237,7 -280,7 +277,7 @@@ Depends: libswscale0 (>= ${binary:Versi
   libavutil-dev (= ${binary:Version}),
   ${misc:Depends}
  Description: Development files for libswscale
-  This is the video scaling library from FFmpeg.
+  This is the video scaling library from Libav.
   .
   This package contains the header files and static libraries needed to
   compile applications or shared objects that use libswscale.

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list