[SCM] libav/squeeze-backports: Merge tag 'debian/6%0.8.5-1' into squeeze-backports

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Jan 24 11:30:11 UTC 2013


drop debian/recordshow
update debian/changelog
Merge tag 'upstream/0.8.5'
Imported Upstream version 0.8.5
update debian/changelog
drop patches applied upstream
Merge tag 'upstream/0.8.4'
Imported Upstream version 0.8.4
update debian/changelog
use EPOCH macro in SHLIBS_VERSION
Drop the package libav-regular-dbg
update debian/changelog
Use xz compression for binary packages, thanks Ansgar Burchardt (Closes: #683895).
Fix generation of shlibs file not only for libavcodec*, but for all the other library packages as well.
Also make libav-regular-dbg 'arch: all' for consistency with the other debug packages.
update debian/changelog
Fix generation of shlibs file
update debian/changelog and correct earlier changelog entries
Make ffmpeg-dbg 'arch: all' for consistency with the libav-extra-dbg package
update debian/changelog
Make libav-extra-dbg arch:all
Fix up debian/changelog and get dependencies right accordingly.
update debian/changelog
Do not run doxygen if it is not installed.
Install all debug symbols into libav-dbg (Closes: #680602).
Mention qt-faststart in the long description (Closes: #681491.)
Remove Multi-arch header from the empty, transitional -extra- packages
Bug fix: "Multi-Arch: foreign libraries", thanks to Stepan Golosunov.
update debian/changelog
Declare a 'Breaks' relationship against mplayer, Closes: #671934
6:0.8.3-3
control/Uploaders: update my email address
Install the shared flavor last
update debian/changelog
{ffmpeg,libav-tools}.install: make files to install more explicit
add Pre-Depend on dpkg to libav-tools to ensure smooth updates
add dependency on libavcodec53 to libav-dbg
fix location in ffmpeg.NEWS file
add patch from upstream to fix playback of Canon AVHCD movies
Restrict Build-Depends to "yasm [any-amd64 any-i386]" and explicitely disable it if not found.
Add a debian/README.source file that describes how to rebuild libav with a reduced feature set in order to avoid circular build-dependencies for bootstrapping.
Tidy up and sort configuration flags.
Use the cond_enable() macro for all additional features in debian/confflags.
Clarify relations between libavcodec53 and libavcodec-extra-53 in debian/control.\n\nConflicts seems too strong, Breaks should be enough, Enhances is plain wrong.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/squeeze-backports
X-Git-Reftype: branch
X-Git-Oldrev: 8aa3536686caed9a762f865768bd43296479cf8d
X-Git-Newrev: 087b996341681dcfbdfc572e6a3fe4c0bad6db62

The following commit has been merged in the squeeze-backports branch:
commit 087b996341681dcfbdfc572e6a3fe4c0bad6db62
Merge: 8aa3536686caed9a762f865768bd43296479cf8d d644a8424dac90f319f3f1505620da5ba6ffa2bd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jan 24 12:21:05 2013 +0100

    Merge tag 'debian/6%0.8.5-1' into squeeze-backports
    
    Debian release 6:0.8.5-1
    
    Conflicts:
    	debian/changelog
    	debian/confflags

diff --combined debian/changelog
index be933e6,ca1cbb4..e29066a
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,140 +1,160 @@@
++libav (6:0.8.5-1~bpo60+1) squeeze-backports; urgency=low
++
++  * Rebuild for squeeze-backports.
++  * Don't install to multiarch paths.
++  * Bump libx264 build-dep to >= 2:0.118.
++  * Do not enable opencv support until the required packages reach
++    squeeze-backports.
++
++ -- Reinhard Tartler <siretart at tauware.de>  Thu, 24 Jan 2013 12:20:31 +0100
++
+ libav (6:0.8.5-1) unstable; urgency=low
+ 
+   * New upstream security/bugfix release. New releases fixes
+     (bug numbers reference http://bugzilla.libav.org, Closes: #694483)
+     - Indeo 4 (CVE-2012-2791)
+     - VP5/VP6 (CVE-2012-2783)
+     - Indeo 3 (CVE-2012-2804)
+     - MPEG-1/2 (CVE-2012-2803)
+     - MP3 (CVE-2012-2797)
+     - AAC (CVE-2012-5144)
+     - AC-3 (CVE-2012-2802)
+     - AVS (CVE-2012-2801)
+     - DFA (CVE-2012-2798)
+     - ID3v2 (Bug 395)
+     - Serious Memory leaks on broken Ogg files
+   * drop recordshow script. This clearly undermaintained script has
+     unclear copyright status and is unlikely to work properly anyways.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 13 Jan 2013 11:56:59 +0100
+ 
+ libav (6:0.8.4-1) unstable; urgency=low
+ 
+   * New upstream security/bugfix release. New release fixes:
+     (bug numbers reference http://bugzilla.libav.org, Closes: #688847)
+     - h264 (Bug 118), vc1dec (CVE-2012-2796), sipr, bmpdec (bug 367), alsdec
+       (CVE-2012-2775), rv34/rv40 (CVE-2012-2772), indeo3/indeo4
+       (CVE-2012-2776, CVE-2012-2779, CVE-2012-2787, CVE-2012-2794,
+       CVE-2012-2800), vorbisenc, vorbisdec (Bug 277), snow, ac3dec
+       (CVE-2012-2802), avsdec (CVE-2012-2801), dfa (CVE-2012-2786,
+       CVE-2012-2798), lagrith (CVE-2012-2793), wmaprodec (CVE-2012-2789 &
+       Bug 327), avidec (CVE-2012-2788, CVE-2012-2790), cavsdec
+       (CVE-2012-2777, CVE-2012-2784), wav (Bug 379), yuff4mpeg (Bug 373),
+       mpegaudio, tiffenc, smacker (Bug 265).
+     - smaller bug fixes in avconv (Bug 352)
+     - fix lt() and lte() in function evaluator
+     - fix segfault in avformat_open_input()
+     - fix segfault in golomb decoder (bug 310)
+     - fix segfault (double free) in libavfilter
+     - convert dfa decoder to bytestream2 API to protect from overreads
+     - bugfix in vf_pad/scale filter (Bug 203 & 245)
+     - lavc: remove stats_out and stats_in from the options table.
+       (Bug 380, Closes: #690726)
+   * Drop patches applied upstream.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 22 Oct 2012 20:57:08 +0200
+ 
+ libav (6:0.8.3-7) unstable; urgency=low
+ 
+   [ Fabian Greffrath ]
+   * Fix generation of shlibs file not only for libavcodec*, but for all the
+     other library packages as well. Really closes: #679542
+   * Use xz compression for binary packages, thanks Ansgar Burchardt
+     (Closes: #683895).
+ 
+   [ Reinhard Tartler ]
+   * use EPOCH macro in SHLIBS_VERSION
+   * Drop the package 'libav-regular-dbg'. It was not included in squeeze.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 25 Aug 2012 11:08:48 +0200
+ 
+ libav (6:0.8.3-6) unstable; urgency=low
+ 
+   * Clarify the changes in the 6:0.8.3-5 upload, as discussed in bug
+     #683247.
+   * Make ffmpeg-dbg 'arch: all' for consistency with the libav-extra-dbg
+     package.
+   * Fix generation of shlibs file. (Closes: #679542)
+     Wrong make variables where used for the shlibs generation.
+   
+  -- Reinhard Tartler <siretart at tauware.de>  Sat, 04 Aug 2012 09:03:54 +0200
+ 
+ libav (6:0.8.3-5) unstable; urgency=low
+ 
+   [ Reinhard Tartler ]
+   * Bug fix: "Multi-Arch: foreign libraries", thanks to Stepan Golosunov.
+     Make the transitional libavfoo-extra-NN packages 'arch: all' and
+     remove the 'Multi-Arch: foreign' fields to avoid that the dependency
+     can be satisfied by packages of other architectures, which would break
+     applications. Closes: #680613
+   * Make libav-extra-dbg 'arch: all'.  As empty, transitional package
+     without strict dependencies, we can safely ship it as arch:all
+     package.
+ 
+   [ Fabian Greffrath ]
+   * Mention qt-faststart in the long description (Closes: #681491).
+   * Install all debug symbols into libav-dbg (Closes: #680602).
+   * Do not run doxygen if it is not installed. This does not change anything
+     for regular builds, but helps with bootstrapping the package to new
+     architectures that may not have doxygen available yet.
+   * Fix up debian/changelog and tighten dependencies.
+   * Do not declare "ffmpeg" as virtual package (provided by libav-tools).
+     Instead, we provide it as transitional package for libav-tools. Note
+     the next upstream version will no longer provide neither an 'ffmpeg'
+     package, nor a /usr/bin/ffmpeg binary. This means that front-end
+     applications in Debian that previously used this binary needs to be
+     ported to /usr/bin/avconv for jessie.
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Sun, 15 Jul 2012 23:13:42 +0200
+ 
+ libav (6:0.8.3-4) unstable; urgency=low
+ 
+   * Declare a 'Breaks' relationship against mplayer, Closes: #671934
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Tue, 26 Jun 2012 08:46:42 +0200
+ 
+ libav (6:0.8.3-3) unstable; urgency=low
+ 
+   * Install the shared flavor last; the binaries from the optimized flavor(s)
+     would overwrite the ones from the shared baseline flavor causing SIGILL;
+     closes: #657885.
+   * control/Uploaders: update my email address
+ 
+  -- Loïc Minier <lool at debian.org>  Mon, 25 Jun 2012 21:21:24 +0200
+ 
+ libav (6:0.8.3-2) unstable; urgency=low
+ 
+   [ Fabian Greffrath ]
+   * Clarify relations between libavcodec53 and libavcodec-extra-53
+     in debian/control.
+   * Use the cond_enable() macro for all additional features in debian/confflags.
+   * Tidy up and sort configuration flags.
+   * Add a debian/README.source file that describes how to rebuild libav
+     with a reduced feature set in order to avoid circular build-dependencies
+     for bootstrapping.
+   * Restrict Build-Depends to "yasm [any-amd64 any-i386]"
+     and explicitly disable it if not found.
+ 
+   [ Reinhard Tartler ]
+   * add patch from upstream to fix playback of Canon AVHCD movies.
+     (Fixes: LP: #937561)
+   * fix location in ffmpeg.NEWS file
+   * add dependency on libavcodec53 to libav-dbg
+   * add Pre-Depend on dpkg to libav-tools to ensure smooth updates
+   * {ffmpeg,libav-tools}.install: make files to install more explicit
+ 
+  -- Reinhard Tartler <siretart at tauware.de>  Mon, 25 Jun 2012 19:06:49 +0200
+ 
 +libav (6:0.8.3-1~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Don't install to multiarch paths.
 +  * Bump libx264 build-dep to >= 2:0.118.
 +  * Do not enable opencv support until the required packages reach
 +    squeeze-backports.
 +
 + -- Reinhard Tartler <siretart at tauware.de>  Sat, 16 Jun 2012 11:56:20 +0200
 +
  libav (6:0.8.3-1) unstable; urgency=medium
  
    [ Andres Mejia ]
@@@ -128,14 -255,6 +275,14 @@@ libav (4:0.8.1-1) unstable; urgency=med
  
   -- Reinhard Tartler <siretart at tauware.de>  Mon, 19 Mar 2012 08:39:18 +0100
  
 +libav (4:0.8-2~bpo60+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Don't install to multiarch paths.
 +  * Bump libx264 build-dep to >= 2:0.118.
 +
 + -- Julien Cristau <jcristau at debian.org>  Sat, 17 Mar 2012 13:34:26 +0100
 +
  libav (4:0.8-2) unstable; urgency=low
  
    [ Reinhard Tartler ]
@@@ -262,13 -381,6 +409,13 @@@ libav (4:0.7.3-1) unstable; urgency=hig
  
   -- Reinhard Tartler <siretart at tauware.de>  Sun, 25 Dec 2011 22:04:54 +0100
  
 +libav (4:0.7.2-1~bpo50+1) squeeze-backports; urgency=low
 +
 +  * Rebuild for squeeze-backports.
 +  * Revert "Convert package to include multiarch support."
 +  
 + -- Reinhard Tartler <siretart at tauware.de>  Thu, 06 Oct 2011 21:13:19 +0200
 +
  libav (4:0.7.2-1) unstable; urgency=low
  
    * New upstream release: 0.7.2
diff --combined debian/confflags
index d349450,c31f88d..5236487
--- a/debian/confflags
+++ b/debian/confflags
@@@ -1,12 -1,7 +1,7 @@@
  # -*- mode: makefile -*-
  # vim:syntax=make
  
- # build a static version on every architecture in the 'debian' Libav package
- FLAVORS := static
- 
- # shared is generic, i.e. without arch specific opcodes
- FLAVORS += shared
- 
+ export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
  export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
  export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
  export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@@ -19,6 -14,9 +14,9 @@@ ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST
      CROSS :=  $(DEB_HOST_GNU_TYPE)-
  endif
  
+ # list of flavors we want to build
+ FLAVORS :=
+ 
  # this outputs 0 or 1 depending on whether a macro appears in the *default* cpp
  # -dM -P output; this is used to test the toolchain *default* configuration
  check_cpp = $(shell $(CROSS)cpp -dM -P /dev/null | grep -q '^\#define $(1)' && echo 1 || echo 0)
@@@ -69,48 -67,42 +67,42 @@@ else ifeq ($(DEB_HOST_ARCH),sparc
      nooptflags += --disable-vis
  endif
  
+ # build a static version on every architecture in the 'debian' Libav package
+ FLAVORS += static
+ 
+ # shared is generic, i.e. without arch specific opcodes
+ # /!\ order matters, you want to list the shared flavor *last* so that the
+ # binaries from this flavor overwrite the ones from the optional optimized
+ # flavor(s) and from the static flavor
+ FLAVORS += shared
+ 
  $(info Building FLAVORS=$(FLAVORS))
  
+ # Conditionally enable certain features depending on
+ # the corresponding header file being installed or not
  define cond_enable
  	$(shell test -r $(1) && echo --enable-$(2) )
  endef
  
- # variant that also require --enable-version3
+ # variant that also requires --enable-version3
  define cond_enable_v3
  	$(shell test -r $(1) && echo --enable-$(2) --enable-version3 )
  endef
  
- # variant that also require --enable-nonfree
+ # variant that also requires --enable-nonfree
  define cond_enable_nf
  	$(shell test -r $(1) && echo --enable-$(2) --enable-nonfree )
  endef
  
- # Configuration flags causing the libs to be GPL tainted
- gpl_confflags += --enable-gpl
- gpl_confflags += --enable-postproc
- gpl_confflags += --enable-swscale
- gpl_confflags += --enable-x11grab
- 
  # Common configuration flags
- confflags += --extra-version='$(DEB_VERSION)'
  confflags += --arch='$(DEB_HOST_ARCH_CPU)'
- confflags += --prefix=/usr
- confflags += --enable-vdpau
- confflags += --enable-bzlib
- confflags += --enable-frei0r
- confflags += --enable-gnutls
- confflags += --enable-libcdio
- confflags += --enable-libgsm
- confflags += --enable-libschroedinger
- confflags += --enable-libspeex
- confflags += --enable-libtheora
- confflags += --enable-libvorbis
  confflags += --enable-pthreads
- confflags += --enable-zlib
- confflags += --enable-libvpx
  confflags += --enable-runtime-cpudetect
- confflags += --enable-libfreetype
- confflags += --enable-libpulse
+ confflags += --extra-version='$(DEB_VERSION)'
+ confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+ confflags += --prefix=/usr
+ confflags += $(shell test -x /usr/bin/yasm || echo --disable-yasm )
+ 
  ifeq      ($(DEB_HOST_ARCH),armel)
  # this is required on Ubuntu lucid as it defaults to thumb2 and Libav has
  # plenty of incompatible assembly; not sure how to detect that properly
@@@ -121,38 -113,48 +113,48 @@@ ifeq      ($(DEB_HOST_ARCH),powerpc
  confflags += --enable-pic
  endif
  
- confflags += $(extra_common_confflags)
- 
- # libva is not available on the hurd
+ # Additional features
+ confflags += $(call cond_enable,/usr/include/bzlib.h,bzlib)
+ confflags += $(call cond_enable,/usr/include/dc1394/dc1394.h,libdc1394)
+ confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
+ confflags += $(call cond_enable,/usr/include/freetype2/freetype/freetype.h,libfreetype)
+ confflags += $(call cond_enable,/usr/include/frei0r.h,frei0r)
+ confflags += $(call cond_enable,/usr/include/gnutls/gnutls.h,gnutls)
+ confflags += $(call cond_enable,/usr/include/gsm/gsm.h,libgsm)
+ confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
+ confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
+ confflags += $(call cond_enable,/usr/include/opencv/cv.hpp,libopencv)
+ confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
+ confflags += $(call cond_enable,/usr/include/pulse/simple.h,libpulse)
+ confflags += $(call cond_enable,/usr/include/schroedinger-1.0/schroedinger/schro.h,libschroedinger)
+ confflags += $(call cond_enable,/usr/include/speex/speex.h,libspeex)
+ confflags += $(call cond_enable,/usr/include/theora/theoraenc.h,libtheora)
  confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
+ confflags += $(call cond_enable,/usr/include/vdpau/vdpau.h,vdpau)
+ confflags += $(call cond_enable,/usr/include/vorbis/vorbisenc.h,libvorbis)
+ confflags += $(call cond_enable,/usr/include/vpx/vpx_encoder.h,libvpx)
+ confflags += $(call cond_enable,/usr/include/zlib.h,zlib)
  
- # this part below is intended for the 'Libav' package in ubuntu/multiverse
- gpl_confflags += $(call cond_enable,/usr/include/dirac/libdirac_decoder/dirac_parser.h,libdirac)
- gpl_confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
- gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
+ # Configuration flags causing the libs to be GPL tainted
+ gpl_confflags += --enable-gpl
+ gpl_confflags += --enable-postproc
+ gpl_confflags += --enable-swscale
+ gpl_confflags += $(call cond_enable,/usr/include/cdio/paranoia.h,libcdio)
+ gpl_confflags += $(call cond_enable,/usr/include/X11/extensions/XShm.h,x11grab)
  gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
  gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
+ # comment out following line for LGPL versions of the libraries
+ confflags += $(gpl_confflags)
  
- confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
- 
- # Features that require GPL v3
+ # Features that require (L)GPL v3
  v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
  v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrwb/dec_if.h,libopencore-amrwb)
  v3_confflags += $(call cond_enable_v3,/usr/include/vo-aacenc/voAAC.h,libvo-aacenc)
  v3_confflags += $(call cond_enable_v3,/usr/include/vo-amrwbenc/enc_if.h,libvo-amrwbenc)
  
- # FAAC is considered non-free upstream
+ # FAAC is considered non-free
  confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
  
- # comment out following line for LGPL versions of the libraries
- confflags += $(gpl_confflags)
- 
- # Enable IEEE 1394 (FireWire) support on Linux only
- ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
-   confflags += --enable-libdc1394
-   lib1394-dev += libraw1394-dev, libdc1394-22-dev
- endif
- 
  # Enable hardened build flags through dpkg-buildflags
  CFLAGS := $(filter-out -g -O2,$(shell dpkg-buildflags --get CFLAGS))
  CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
@@@ -169,7 -171,7 +171,7 @@@ endi
  static_build_confflags += $(confflags)
  
  # Configuration flags for the non-optimized shared libraries
 -shared_build_confflags += $(confflags) --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 +shared_build_confflags += $(confflags)
  # amd64 has no problems with optimized shared libs. i386 and arm do.
  ifneq      ($(DEB_HOST_ARCH),amd64)
  shared_build_confflags += $(nooptflags)
diff --combined debian/control
index d21e64b,799e8c4..8103357
--- a/debian/control
+++ b/debian/control
@@@ -4,7 -4,7 +4,7 @@@ Priority: optiona
  Maintainer: Debian Multimedia 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>,
+  Loïc Minier <lool at debian.org>,
   Reinhard Tartler <siretart at tauware.de>,
   Fabian Greffrath <fabian+debian at greffrath.com>,
   Andres Mejia <amejia at debian.org>,
@@@ -17,13 -17,14 +17,13 @@@ Homepage: http://libav.org
  Build-Depends-Indep:
   doxygen
  Build-Depends:
 - debhelper (>= 8.1.3~),
 + debhelper (>= 7),
   frei0r-plugins-dev,
   libasound2-dev [linux-any],
   libbz2-dev,
   libcdio-cdda-dev,
   libcdio-dev,
   libcdio-paranoia-dev,
 - libcv-dev,
   libdc1394-22-dev [linux-any],
   libdirac-dev,
   libfreetype6-dev,
@@@ -34,6 -35,7 +34,6 @@@
   libmp3lame-dev,
   libopencore-amrnb-dev,
   libopencore-amrwb-dev,
 - libopencv-dev,
   libopenjpeg-dev,
   libpulse-dev,
   libraw1394-dev [linux-any],
@@@ -50,24 -52,24 +50,24 @@@
   libvorbis-dev,
   libvpx-dev,
   libx11-dev,
 - libx264-dev,
 + libx264-dev (>= 2:0.118),
   libxext-dev,
   libxfixes-dev,
   libxvidcore-dev,
   libxvmc-dev,
   texi2html,
-  yasm,
+  yasm [any-amd64 any-i386],
   zlib1g-dev
  
  Package: libav-tools
  Section: video
  Architecture: any
- Provides:
-  ffmpeg
  Replaces:
   ffmpeg (<< 4:0.8~),
   libavcodec-extra-53 (<< 4:0.6~),
   libavcodec53 (<< ${source:Version})
+ Pre-Depends:
+  dpkg (>= 1.15.7.2~)
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -83,7 -85,8 +83,8 @@@ Description: Multimedia player, server
   streaming server, the avconv audio and video encoder, and the avprobe
   stream analyzer.  They support most existing file formats (AVI, MPEG,
   OGG, Matroska, ASF...) and encoding formats (MPEG, DivX, MPEG4, AC3,
-  DV...).
+  DV...). Additionally, it contains the qt-faststart utility which
+  rearranges Quicktime files to facilitate network streaming.
  
  Package: ffmpeg
  Section: oldlibs
@@@ -104,7 -107,7 +105,7 @@@ Description: Multimedia player, server
  Package: ffmpeg-dbg
  Section: oldlibs
  Priority: extra
- Architecture: any
+ Architecture: all
  Depends:
   libav-dbg,
   ${misc:Depends}
@@@ -112,26 -115,22 +113,22 @@@ Description: Debug symbols for Libav re
   Libav is a complete, cross-platform solution to decode, encode, record,
   convert and stream audio and video.
   .
-  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 contains the debug symbols for the deprecated ffmpeg program.
-  It also serves as a transitional package to libav-tools-dbg.
+  This package serves as a transitional package to libav-dbg.
  
  Package: libav-dbg
  Section: debug
  Priority: extra
  Architecture: any
- Provides:
-  ffmpeg-dbg
  Replaces:
-  ffmpeg-dbg (<< 5:0.8.1-3)
+  ffmpeg-dbg (<< 6:0.8.3-5),
+  libav-extra-dbg (<< 6:0.8.3-5)
  Breaks:
-  ffmpeg-dbg (<< 5:0.8.1-3)
+  ffmpeg-dbg (<< 6:0.8.3-5),
+  libav-extra-dbg (<< 6:0.8.3-5)
  Depends:
+  ffmpeg (= ${binary:Version}),
   libav-tools (= ${binary:Version}),
+  libavcodec53 (= ${binary:Version}) | libavcodec-extra-53 (= ${binary:Version}),
   libavdevice53 (= ${binary:Version}),
   libavformat53 (= ${binary:Version}),
   libavutil51 (= ${binary:Version}),
@@@ -147,37 -146,18 +144,18 @@@ Description: Debug symbols for Libav re
   Most people will not need this package. Please install it to produce useful
   stacktraces to help debugging the Libav library.
  
- Package: libav-regular-dbg
- Section: debug
- Priority: extra
- Architecture: any
- Depends:
-  libavcodec53 (= ${binary:Version}),
-  ${misc:Depends}
- Description: Debug symbols for Libav related packages
-  Libav is a complete, cross-platform solution to decode, encode, record,
-  convert and stream audio and video.
-  .
-  This package contains debug data of the libavcodec regular shared library.
-  .
-  Most people will not need this package. Please install it to produce useful
-  stacktraces to help debugging the Libav library.
- 
  Package: libav-extra-dbg
- Section: debug
+ Section: oldlibs
  Priority: extra
- Architecture: any
+ Architecture: all
  Depends:
-  libavcodec-extra-53 (= ${binary:Version}),
+  libav-dbg,
   ${misc:Depends}
- Description: Debug symbols for Libav related packages
+ Description: Debug symbols for Libav related packages (transitional package)
   Libav is a complete, cross-platform solution to decode, encode, record,
   convert and stream audio and video.
   .
-  This package contains debug data of the libavcodec extra shared library.
-  .
-  Most people will not need this package. Please install it to produce useful
-  stacktraces to help debugging the Libav library.
+  This package serves as a transitional package to libav-dbg.
  
  Package: ffmpeg-doc
  Section: oldlibs
@@@ -216,6 -196,8 +194,6 @@@ Description: Documentation of the Liba
  
  Package: libavutil51
  Architecture: any
 -Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -234,13 -216,14 +212,12 @@@ Description: Libav utility librar
  
  Package: libavcodec53
  Architecture: any
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
- Conflicts:
-  libavcodec-extra-53
  Breaks:
-  libavcodec-extra-53 (<< 4:0.8.0.2)
+  libavcodec-extra-53,
+  mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
  Description: Libav codec library
   Libav is a complete, cross-platform solution to decode, encode, record,
   convert and stream audio and video.
@@@ -251,6 -234,8 +228,6 @@@
  
  Package: libavdevice53
  Architecture: any
 -Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -268,6 -253,8 +245,6 @@@ Description: Libav device handling libr
  
  Package: libavformat53
  Architecture: any
 -Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -288,6 -275,8 +265,6 @@@ Description: Libav file format librar
  
  Package: libavfilter2
  Architecture: any
 -Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -305,6 -294,8 +282,6 @@@ Description: Libav video filtering libr
  
  Package: libpostproc52
  Architecture: any
 -Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -322,6 -313,8 +299,6 @@@ Description: Libav video postprocessin
  
  Package: libswscale2
  Architecture: any
 -Multi-Arch: same
 -Pre-Depends: ${misc:Pre-Depends}
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
@@@ -361,16 -354,17 +338,17 @@@ Depends
   libavutil-dev (= ${binary:Version}),
   ${misc:Depends}
  Suggests:
+  libdc1394-22-dev [linux-any],
   libgsm1-dev,
   libogg-dev,
+  libraw1394-dev [linux-any],
   libschroedinger-dev,
   libspeex-dev,
   libtheora-dev (>> 0.0.0.alpha4),
   libvorbis-dev,
   libx11-dev,
   libxext-dev,
-  zlib1g-dev,
-  ${lib1394-dev}
+  zlib1g-dev
  Description: Development files for libavcodec
   Libav is a complete, cross-platform solution to decode, encode, record,
   convert and stream audio and video.
@@@ -467,7 -461,6 +445,6 @@@ Package: libavutil-extra-5
  Section: oldlibs
  Priority: extra
  Architecture: all
- Multi-Arch: foreign
  Depends:
   libavutil51,
   ${misc:Depends},
@@@ -481,40 -474,37 +458,36 @@@ Description: Libav utility library (tra
  Package: libavcodec-extra-53
  Architecture: any
  Multi-Arch: same
  Depends:
   ${misc:Depends},
   ${shlibs:Depends}
  Replaces:
   libavcodec53
  Breaks:
+  libavcodec53,
   mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
- Enhances:
-  libavcodec53
- Description: Libav codec library
+ Description: Libav codec library (additional codecs)
   Libav is a complete, cross-platform solution to decode, encode, record,
   convert and stream audio and video.
   .
   This is the codec library from Libav (both encoding and decoding).
   .
-  This package is an enhancement to the regular libavcodec library package.
-  This package contains the following additional codecs.
+  This package is a replacement for the regular libavcodec53 library package;
+  it contains the following additional codecs:
   .
    * OpenCORE Adaptive Multi-Rate (AMR) Narrow-Band (Encoder/Decoder)
    * OpenCORE Adaptive Multi-Rate (AMR) Wide-Band (Decoder)
    * Android VisualOn AAC (Encoder)
    * Android VisualOn Adaptive Multi-Rate (AMR) Wide-Band (Encoder)
   .
-  Because this package links against libraries that are licensed
-  under Apache License 2.0, the resulting binaries are distributed under the
-  GPL version 3.
+  Because this package links against libraries that are licensed under
+  Apache License 2.0, the resulting binaries are distributed under the
+  GPL version 3 or later.
  
  Package: libavdevice-extra-53
  Section: oldlibs
  Priority: extra
  Architecture: all
- Multi-Arch: foreign
  Depends:
   libavdevice53,
   ${misc:Depends},
@@@ -529,7 -519,6 +502,6 @@@ Package: libavfilter-extra-
  Section: oldlibs
  Priority: extra
  Architecture: all
- Multi-Arch: foreign
  Depends:
   libavfilter2,
   ${misc:Depends},
@@@ -544,7 -533,6 +516,6 @@@ Package: libpostproc-extra-5
  Section: oldlibs
  Priority: extra
  Architecture: all
- Multi-Arch: foreign
  Depends:
   libpostproc52,
   ${misc:Depends},
@@@ -559,7 -547,6 +530,6 @@@ Package: libavformat-extra-5
  Section: oldlibs
  Priority: extra
  Architecture: all
- Multi-Arch: foreign
  Depends:
   libavformat53,
   ${misc:Depends},
@@@ -574,7 -561,6 +544,6 @@@ Package: libswscale-extra-
  Section: oldlibs
  Priority: extra
  Architecture: all
- Multi-Arch: foreign
  Depends:
   libswscale2,
   ${misc:Depends},

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list