[SCM] libav/squeeze-backports: Merge tag 'debian/6%0.8.3-1' into squeeze-backports
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jun 16 15:52:01 UTC 2012
update debian/changelog
Merge tag 'upstream/0.8.3'
Imported Upstream version 0.8.3
Update libav-doc doc base. (Closes: #674139)
create correct shlibs file for libavcodec-extra-53
update debian/changelog
cleanup generated formats*.txt and codec*.txt
Simplify internal dependencies
add comments about the various PKGS variables
Revert "temporarily disable opencv to work around dependency troubles"
prepare new upload
break long line
bump urgency
update debian/changelog
Revert "Revert "temporarily disable opencv to work around dependency troubles""
drop 02-fix-avpreset-extension.patch, applied upstream
Merge tag 'upstream/0.8.2'
Imported Upstream version 0.8.2
Don't ignore errors in maintainer scripts.
Update changelog.
Revert "temporarily disable opencv to work around dependency troubles"
Update changelog.
Add #DEBHELPER# line to maintainer scripts.
Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
Add closes bug for other issue related to hurd build.
Update changelog.
Fix build for hurd. Thanks to Samuel Thibault for patch.
update debian/changelog
temporarily disable opencv to work around dependency troubles
Fix epoch in strict internal dependencies. Closes: #670861
bump epoch to fix messed upload to unstable (Closes: #670762)
Fix issue with generation of formats-*.txt file.
Fix issue with file not being multiarch compatible. (Closes: #669988)
Update changelog.
Have both libavcodec and libavcodec-extra package conflict with each other.
Use a Provides field to provide transitional packages instead of Conflicts. (Closes: #666401)
Update changelog for new upload.
Add symlinks to manpages for replaced programs.
Point to changelog inside ffmpeg package.
Fix spelling.
Add NEWS entry for ffmpeg deprecation.
Update changelog.
Change ffmpeg warning so that it's clearer the program is deprecated (LP: #939863)
Fix file conflicts between ffmpeg and libav-tools package.
Seperate the ffmpeg program into the transitional package.
Prepare new upload.
Update changelog.
Update changelog.
Mention license impact in libavcodec-extra-53's package description.
Fix issue with installation of debug symbols. (Closes: #642798)
Set Enhances field and update package description for libavcodec-extra package. (Closes: #653451)
Update changelog.
Remove dependencies and suggests of FAAD, no longer needed.
Remove libav-source package. No longer necessary.
Change packaging to only build libavcodec-extra* package. Other extra packages are unnecessary.
Filter out build of static library for packages.
Change packaging to build libav*-extra* packages through libav source package.
Install manpage for qt-faststart in the correct package.
upload to unstable
Don't override -g or -O3 flags set by libav's build system.
Enable jack support for all architectures. Hurd now has jack packages.
Make clear that is FAAC that's considered non-free, not AAC.
Update comment about GPLv3 features.
Include conditional enablers for vo-aacenc and vo-amrwbenc.
Update changelog.
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libav
Enable vaapi for all architectures. libva is available on all architectures.
Enable pulse support.
Enable opencv support.
Enable libcdio support.
Enable tls support through gnutls.
Enable frei0r support.
update debian/changelog
Update changelog.
fix installation of avserver.conf and recordshow.sh into libav-tools
bump standards version, no changes needed
drop all post-0.8 patches, applied upstream
Merge tag 'upstream/0.8.1'
Imported Upstream version 0.8.1
force upgrades of older libavcodec-extra-53 packages
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: 0dc53855a3ceaeedd8d523832c893587325bf3fb
X-Git-Newrev: 8aa3536686caed9a762f865768bd43296479cf8d
The following commit has been merged in the squeeze-backports branch:
commit 3a0d1046489722fa767e11553bc6f5413d307425
Merge: 0dc53855a3ceaeedd8d523832c893587325bf3fb 761d47543e26826e626c05791b16ca3ae95e801e
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jun 16 11:56:12 2012 +0200
Merge tag 'debian/6%0.8.3-1' into squeeze-backports
Debian release 6:0.8.3-1
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index 165fd6a,dd33a26..744e84e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,123 +1,131 @@@
+ libav (6:0.8.3-1) unstable; urgency=medium
+
+ [ Andres Mejia ]
+ * Update libav-doc doc base. (Closes: #674139)
+
+ [ Reinhard Tartler ]
+ * New upstream release 0.8.3:
+ - Several bugs and crashes have been fixed in the following codecs: PNG,
+ Electronic Arts TQI, H.264 (CVE-2012-0851) and H.263 (CVE-2011-3937)
+ * Raising severity because of security issues.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 09 Jun 2012 13:25:31 +0200
+
+ libav (6:0.8.2-2) unstable; urgency=low
+
+ * Revert "temporarily disable opencv to work around dependency troubles"
+ * Simplify internal dependencies (Closes: #672791)
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 14 May 2012 21:37:59 +0200
+
+ libav (6:0.8.2-1) unstable; urgency=medium
+
+ * New upstream release:
+ - Several bugs and crashes have been fixed in the following codecs: AAC,
+ APE, H.263, H.264, Indeo 4, Mimic, MJPEG, Motion Pixels Video, RAW,
+ TTA, VC1, VQA, WMA Voice, vqavideo (CVE-2012-0947).
+ - Several bugs and crashes have been fixed in the following formats:
+ ASF, ID3v2, MOV, xWMA
+ - This release additionally updates the following codecs to the
+ bytestream2 API, and therefore benefit from additional overflow
+ checks: truemotion2, utvideo, vqavideo
+ * drop 02-fix-avpreset-extension.patch, applied upstream
+ * Revert "Revert "temporarily disable opencv to work around dependency
+ troubles"" (Closes: #671302)
+ * Bumped urgency because of security issue.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 05 May 2012 11:08:44 +0200
+
+ libav (6:0.8.1-7) unstable; urgency=low
+
+ * Fix build for hurd. Thanks to Samuel Thibault for patch. (Closes: #613034)
+ (Closes: #671038)
+ * Properly migrate /etc/ffserver.conf to /etc/avserver.conf.
+ (Closes: #660786)
+ * Renable opencv support.
+
+ -- Andres Mejia <amejia at debian.org> Tue, 01 May 2012 21:33:13 -0400
+
+ libav (6:0.8.1-6) unstable; urgency=low
+
+ * Fix epoch in strict internal dependencies. Closes: #670861
+ * Temporarily disable opencv to work around dependency trouble
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 30 Apr 2012 08:14:20 +0200
+
+ libav (6:0.8.1-5) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Fix issue with file not being multiarch compatible. (Closes: #669988)
+
+ [ Reinhard Tartler ]
+ * Bump epoch to fix messed upload to unstable (Closes: #670762)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 29 Apr 2012 10:30:26 +0200
+
+ libav (5:0.8.1-4) unstable; urgency=low
+
+ * Use a Provides field to provide transitional packages instead of Conflicts.
+ (Closes: #666401)
+ * Have both libavcodec and libavcodec-extra package conflict with each other.
+
+ -- Andres Mejia <amejia at debian.org> Fri, 30 Mar 2012 10:15:50 -0400
+
+ libav (5:0.8.1-3) unstable; urgency=low
+
+ * Separate the ffmpeg program into the transitional package.
+ * Change ffmpeg warning so that it's clearer the program is
+ deprecated (LP: #939863)
+
+ -- Andres Mejia <amejia at debian.org> Thu, 29 Mar 2012 13:13:01 -0400
+
+ libav (5:0.8.1-2) experimental; urgency=low
+
+ [ Andres Mejia ]
+ * Merge libav-extra packages to libav. (Closes: #658084)
+ * Provide only libavcodec-extra package, the other packages are unnecessary.
+ * Remove libav-source package. No longer necessary.
+ * Remove dependencies and suggests of FAAD, no longer needed.
+ * Set Enhances field and update package description for libavcodec-extra
+ package. (Closes: #653451)
+ * Fix issue with installation of debug symbols. (Closes: #642798)
+
+ [ Fabian Greffrath ]
+ * Mention license impact in libavcodec-extra-53's package description.
+
+ -- Andres Mejia <amejia at debian.org> Wed, 21 Mar 2012 15:52:58 -0400
+
+ libav (4:0.8.1-1) unstable; urgency=medium
+
+ [ Reinhard Tartler ]
+ * Bump shlibs (Closes: #662793)
+ * force upgrades of older libavcodec-extra-53 packages
+ * drop all post-0.8 patches, applied upstream
+ * bump standards version, no changes needed
+ * Imported Upstream version 0.8.1
+ * Bumped urgency to medium because of included security fixes:
+ CVE-2012-0848, CVE-2012-0853, CVE-2012-0858, CVE-2011-3929,
+ CVE-2011-3936, CVE-2011-3937, CVE-2011-3940, CVE-2011-3945,
+ CVE-2011-3947, CVE-2011-3951, CVE-2011-3952
+
+ [ Andres Mejia ]
+ * Enable frei0r support.
+ * Enable tls support through gnutls.
+ * Enable libcdio support.
+ * Enable opencv support.
+ * Enable pulse support.
+ * Enable vaapi for all architectures.
+
+ -- 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 ]
@@@ -132,13 -244,6 +252,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 9bd8003,6c78316..6aae311
--- a/debian/confflags
+++ b/debian/confflags
@@@ -7,6 -7,7 +7,6 @@@ FLAVORS := stati
# 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)
@@@ -95,9 -96,14 +95,13 @@@ gpl_confflags += --enable-x11gra
confflags += --extra-version='$(DEB_VERSION)'
confflags += --arch='$(DEB_HOST_ARCH_CPU)'
confflags += --prefix=/usr
-confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
confflags += --enable-vdpau
confflags += --enable-bzlib
+ confflags += --enable-frei0r
+ confflags += --enable-gnutls
+ confflags += --enable-libcdio
confflags += --enable-libgsm
+ confflags += --enable-libopencv
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -107,6 -113,7 +111,7 @@@ confflags += --enable-zli
confflags += --enable-libvpx
confflags += --enable-runtime-cpudetect
confflags += --enable-libfreetype
+ confflags += --enable-libpulse
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
@@@ -119,7 -126,7 +124,7 @@@ endi
confflags += $(extra_common_confflags)
- # vaapi is not available on s390 and on the hurd
+ # libva is not available on the hurd
confflags += $(call cond_enable,/usr/include/va/va.h,vaapi)
# this part below is intended for the 'Libav' package in ubuntu/multiverse
@@@ -131,16 -138,17 +136,17 @@@ gpl_confflags += $(call cond_enable,/us
confflags += $(call cond_enable,/usr/include/openjpeg.h,libopenjpeg)
- # Opencore-amr requires GPL v3
+ # Features that require 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)
- # AAC is considered non-free upstream
+ # FAAC is considered non-free upstream
confflags += $(call cond_enable_nf,/usr/include/faac.h,libfaac)
# comment out following line for LGPL versions of the libraries
confflags += $(gpl_confflags)
- confflags += $(v3_confflags)
# Enable IEEE 1394 (FireWire) support on Linux only
ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
@@@ -149,7 -157,7 +155,7 @@@
endif
# Enable hardened build flags through dpkg-buildflags
- CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
+ CFLAGS := $(filter-out -g -O2,$(shell dpkg-buildflags --get CFLAGS))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
LDFLAGS := $(filter-out %-Bsymbolic-functions,$(shell dpkg-buildflags --get LDFLAGS))
@@@ -164,7 -172,7 +170,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 bf32d1f,7157b9e..f59ea06
--- a/debian/control
+++ b/debian/control
@@@ -10,23 -10,34 +10,34 @@@ Uploaders
Andres Mejia <amejia at debian.org>,
Jonas Smedegaard <dr at jones.dk>
DM-Upload-Allowed: yes
- Standards-Version: 3.9.2
+ Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
Homepage: http://libav.org/
Build-Depends-Indep:
doxygen
- Build-Depends: debhelper (>= 7),
+ 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,
+ libgnutls-dev,
libgsm1-dev,
libimlib2-dev,
- libjack-dev [!hurd-i386],
+ libjack-dev,
libmp3lame-dev,
+ libopencore-amrnb-dev,
+ libopencore-amrwb-dev,
+ libopencv-dev,
libopenjpeg-dev,
+ libpulse-dev,
libraw1394-dev [linux-any],
librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
@@@ -34,12 -45,14 +45,14 @@@
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libtiff4-dev | libtiff-dev,
- libva-dev [!hurd-i386],
+ libva-dev [!hurd-any],
libvdpau-dev,
+ libvo-aacenc-dev,
+ libvo-amrwbenc-dev,
libvorbis-dev,
libvpx-dev,
libx11-dev,
- libx264-dev,
+ libx264-dev (>= 2:0.118),
libxext-dev,
libxfixes-dev,
libxvidcore-dev,
@@@ -51,6 -64,8 +64,8 @@@
Package: libav-tools
Section: video
Architecture: any
+ Provides:
+ ffmpeg
Replaces:
ffmpeg (<< 4:0.8~),
libavcodec-extra-53 (<< 4:0.6~),
@@@ -75,7 -90,7 +90,7 @@@ Description: Multimedia player, server
Package: ffmpeg
Section: oldlibs
Priority: extra
- Architecture: all
+ Architecture: any
Depends:
libav-tools,
${misc:Depends},
@@@ -84,8 -99,9 +99,9 @@@ Description: Multimedia player, server
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
.
- This package is only used for transitional purposes and can be safely
- removed when no other packages depend on this package.
+ This package contains the deprecated ffmpeg program. This package also serves
+ as a transitional package to libav-tools. Users are advised to use avconv from
+ the libav-tools package instead of ffmpeg.
Package: ffmpeg-dbg
Section: oldlibs
@@@ -103,16 -119,21 +119,21 @@@ 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 libraries.
.
- This package is only used for transitional purposes and can be safely
- removed.
+ This package contains the debug symbols for the deprecated ffmpeg program.
+ It also serves as a transitional package to libav-tools-dbg.
Package: libav-dbg
Section: debug
Priority: extra
Architecture: any
+ Provides:
+ ffmpeg-dbg
+ Replaces:
+ ffmpeg-dbg (<< 5:0.8.1-3)
+ Breaks:
+ ffmpeg-dbg (<< 5:0.8.1-3)
Depends:
libav-tools (= ${binary:Version}),
- libavcodec53 (= ${binary:Version}),
libavdevice53 (= ${binary:Version}),
libavformat53 (= ${binary:Version}),
libavutil51 (= ${binary:Version}),
@@@ -128,20 -149,37 +149,37 @@@ 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-source
- Architecture: all
- Section: devel
+ Package: libav-regular-dbg
+ Section: debug
+ Priority: extra
+ Architecture: any
Depends:
+ libavcodec53 (= ${binary:Version}),
${misc:Depends}
- Description: Patched Libav sources
+ 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 a tarball the source file that were used to produce
- this package, containing all modifications that have been applied inline.
+ This package contains debug data of the libavcodec regular shared library.
.
- This package is used as build-dependency for 'libav-extra', which provides
- the "extra" variants of libav.
+ 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
+ Priority: extra
+ Architecture: any
+ Depends:
+ libavcodec-extra-53 (= ${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 extra shared library.
+ .
+ Most people will not need this package. Please install it to produce useful
+ stacktraces to help debugging the Libav library.
Package: ffmpeg-doc
Section: oldlibs
@@@ -180,10 -218,17 +218,16 @@@ Description: Documentation of the Liba
Package: libavutil51
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavutil-extra-51
+ Replaces:
+ libavutil-extra-51
+ Breaks:
+ libavutil-extra-51 (<< 5:0.8.1-2)
Description: Libav utility library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -193,10 -238,15 +237,14 @@@
Package: libavcodec53
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Conflicts:
+ libavcodec-extra-53
+ Breaks:
+ libavcodec-extra-53 (<< 4:0.8.0.2)
Description: Libav codec library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -207,10 -257,17 +255,16 @@@
Package: libavdevice53
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavdevice-extra-53
+ Replaces:
+ libavdevice-extra-53
+ Breaks:
+ libavdevice-extra-53 (<< 5:0.8.1-2)
Description: Libav device handling library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -219,10 -276,17 +273,16 @@@
Package: libavformat53
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavformat-extra-53
+ Replaces:
+ libavformat-extra-53
+ Breaks:
+ libavformat-extra-53 (<< 5:0.8.1-2)
Description: Libav file format library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -234,10 -298,17 +294,16 @@@
Package: libavfilter2
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libavfilter-extra-2
+ Replaces:
+ libavfilter-extra-2
+ Breaks:
+ libavfilter-extra-2 (<< 5:0.8.1-2)
Description: Libav video filtering library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -246,10 -317,17 +312,16 @@@
Package: libpostproc52
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libpostproc-extra-52
+ Replaces:
+ libpostproc-extra-52
+ Breaks:
+ libpostproc-extra-52 (<< 5:0.8.1-2)
Description: Libav video postprocessing library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -258,10 -336,17 +330,16 @@@
Package: libswscale2
Architecture: any
-Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
${misc:Depends},
${shlibs:Depends}
+ Provides:
+ libswscale-extra-2
+ Replaces:
+ libswscale-extra-2
+ Breaks:
+ libswscale-extra-2 (<< 5:0.8.1-2)
Description: Libav video scaling library
Libav is a complete, cross-platform solution to decode, encode, record,
convert and stream audio and video.
@@@ -272,8 -357,7 +350,7 @@@ Package: libavutil-de
Section: libdevel
Architecture: any
Depends:
- libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}.99),
- libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
+ libavutil51 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavutil
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -288,12 -372,11 +365,11 @@@ Package: libavcodec-de
Section: libdevel
Architecture: any
Depends:
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}.99),
- libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
+ libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${source:Upstream-Version}-99),
+ libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Suggests:
- libfaad-dev,
libgsm1-dev,
libogg-dev,
libschroedinger-dev,
@@@ -318,8 -401,7 +394,7 @@@ Package: libavdevice-de
Section: libdevel
Architecture: any
Depends:
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}.99),
- libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
+ libavdevice53 (= ${binary:Version}),
libavformat-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavdevice
@@@ -336,8 -418,7 +411,7 @@@ Section: libdeve
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}.99),
- libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
+ libavformat53 (= ${binary:Version}),
libavutil-dev (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavformat
@@@ -355,8 -436,7 +429,7 @@@ Section: libdeve
Architecture: any
Depends:
libavcodec-dev (= ${binary:Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}.99),
- libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
+ libavfilter2 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libavfilter
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -372,8 -452,7 +445,7 @@@ Section: libdeve
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}.99),
- libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
+ libpostproc52 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libpostproc
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -389,8 -468,7 +461,7 @@@ Section: libdeve
Architecture: any
Depends:
libavutil-dev (= ${binary:Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-2 (<= ${source:Upstream-Version}.99),
- libswscale2 (>= ${binary:Version}) | libswscale-extra-2 (>= ${source:Upstream-Version}),
+ libswscale2 (= ${binary:Version}),
${misc:Depends}
Description: Development files for libswscale
Libav is a complete, cross-platform solution to decode, encode, record,
@@@ -400,3 -478,126 +471,126 @@@
.
This package contains the header files and static libraries needed to
compile applications or shared objects that use libswscale.
+
+ Package: libavutil-extra-51
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Multi-Arch: foreign
+ Depends:
+ libavutil51,
+ ${misc:Depends},
+ Description: Libav utility library (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
+
+ Package: libavcodec-extra-53
+ Architecture: any
+ Multi-Arch: same
+ Pre-Depends: ${misc:Pre-Depends}
+ Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+ Conflicts:
+ libavcodec53
+ Replaces:
+ libavcodec53
+ Breaks:
+ mplayer (<< 2:1.0~rc4.dfsg1+svn34540-1~)
+ Enhances:
+ libavcodec53
+ Description: Libav codec library
+ 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.
+ .
+ * 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.
+
+ Package: libavdevice-extra-53
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Multi-Arch: foreign
+ Depends:
+ libavdevice53,
+ ${misc:Depends},
+ Description: Libav device handling library (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
+
+ Package: libavfilter-extra-2
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Multi-Arch: foreign
+ Depends:
+ libavfilter2,
+ ${misc:Depends},
+ Description: Libav filter library (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
+
+ Package: libpostproc-extra-52
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Multi-Arch: foreign
+ Depends:
+ libpostproc52,
+ ${misc:Depends},
+ Description: Libav video postprocessing library (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
+
+ Package: libavformat-extra-53
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Multi-Arch: foreign
+ Depends:
+ libavformat53,
+ ${misc:Depends},
+ Description: Libav video postprocessing library (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
+
+ Package: libswscale-extra-2
+ Section: oldlibs
+ Priority: extra
+ Architecture: all
+ Multi-Arch: foreign
+ Depends:
+ libswscale2,
+ ${misc:Depends},
+ Description: Libav video software scaling library (transitional package)
+ Libav is a complete, cross-platform solution to decode, encode, record,
+ convert and stream audio and video.
+ .
+ This package is only used for transitional purposes and can be safely
+ removed when no other packages depend on this package.
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list