[SCM] ffmpeg/ubuntu.extra: Merge branch 'ubuntu' into ubuntu.extra
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Nov 19 20:51:30 UTC 2010
update debian/changelog
fix description in libswscale-dev
Merge commit 'debian/4%0.6.1-2' into ubuntu
update debian/changelog
Configure with --enable-pic on powerpc. LP: #654666.
Bump Standards-Version, no changes needed
update Standards-Version
Adjust changelog (tidying too late: was already released).
Update changelog, tidy it, and tag it as UNRELEASED.
Add myself as uploader.
Single-space indent continuated lines in control file.
Merge branch 'master.snapshot' of git.debian.org:/git/pkg-multimedia/ffmpeg into master.snapshot
Relax mplayer Breaks to permit backports and other early releases.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/ubuntu.extra
X-Git-Reftype: branch
X-Git-Oldrev: 77e3fd2b00d8e254ea1322d4e9b74d1af96872ae
X-Git-Newrev: 89b0b08109a323e2d6802dc1540741d182a5680c
The following commit has been merged in the ubuntu.extra branch:
commit efd96c086b79b2bbdaa3ca1b2e873b8bf179c5f0
Merge: 77e3fd2b00d8e254ea1322d4e9b74d1af96872ae 012f3392c047e6917b9908b35b17623d0ec546c7
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Nov 19 12:14:59 2010 +0100
Merge branch 'ubuntu' into ubuntu.extra
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index e0d1618,0ed069e..28051de
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,30 @@@
+ 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 ]
+ * Relax mplayer Breaks to permit backports and other early releases.
+
+ [ Reinhard Tartler ]
+ * Bump Standards-Version, no changes needed.
+
+ [ Matthias Klose ]
+ * Configure with --enable-pic on powerpc. LP: #654666.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 10:50:51 +0100
+
+ffmpeg-extra (4:0.6.1-1ubuntu1) natty; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 14 Nov 2010 21:03:40 +0100
+
ffmpeg (4:0.6.1-1ubuntu1) natty; urgency=low
* Merge from debian. Remaining changes:
@@@ -23,26 -36,6 +43,26 @@@ ffmpeg (4:0.6.1-1) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Mon, 01 Nov 2010 09:18:08 +0100
+ffmpeg-extra (4:0.6-2ubuntu5) natty; urgency=low
+
+ * Remove dummy packages with 'unstripped' notation
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 14 Nov 2010 11:35:26 +0100
+
+ffmpeg-extra (4:0.6-2ubuntu4) natty; urgency=low
+
+ * sort build-deps alphabetically
+ * build against librtmp-dev, closes LP: #673850
+ * Bump Standards Version
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 12 Nov 2010 17:50:19 +0100
+
+ffmpeg-extra (4:0.6-2ubuntu3) maverick; urgency=low
+
+ * merge changes from 'ffmpeg' package
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 05 Oct 2010 21:40:28 +0200
+
ffmpeg (4:0.6-2ubuntu6) maverick; urgency=low
* fix dependency on libswscale-extra-0, LP: #637895
@@@ -73,20 -66,6 +93,20 @@@ ffmpeg (4:0.6-2ubuntu2) maverick; urgen
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 20:38:27 -0400
+ffmpeg-extra (4:0.6-2ubuntu2) maverick; urgency=low
+
+ * Add libxfixes-dev to build-depends, LP: #631103. Thanks to
+ Dominic Evans for the initial patch against ffmpeg.
+
+ -- Stefan Potyra <sistpoty at ubuntu.com> Sun, 19 Sep 2010 13:55:05 +0200
+
+ffmpeg-extra (4:0.6-2ubuntu1) maverick; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 13:04:08 +0200
+
ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
* merge from debian/experimental. remaining changes:
@@@ -120,13 -99,6 +140,13 @@@ ffmpeg (4:0.6-2) experimental; urgency=
-- Reinhard Tartler <siretart at tauware.de> Tue, 29 Jun 2010 09:07:56 +0200
+ffmpeg-extra (4:0.6-1ubuntu1) maverick; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 16 Jun 2010 13:04:08 +0200
+
ffmpeg (4:0.6-1ubuntu1) maverick; urgency=low
* merge from debian/experimental. remaining changes:
@@@ -155,40 -127,6 +175,40 @@@ ffmpeg (4:0.6~svn20100505-1ubuntu2) mav
-- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 11:33:32 +0200
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu5) maverick; urgency=low
+
+ * install files into libavfilter-extra-1.install. LP: #587424
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 22:07:30 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu4) maverick; urgency=low
+
+ * bump soname for package libavutil49->libavutil50
+ * fix installation rule, LP: #587424
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 03 Jun 2010 11:42:48 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu3) maverick; urgency=low
+
+ * remove all install rules that are related to non-library packages
+ Fixes FTBFS
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 28 May 2010 15:09:06 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu2) maverick; urgency=low
+
+ * don't try install html files, we don't build ffmpeg-doc in ffmpeg-extra
+ Fixes FTBFS
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 28 May 2010 13:34:02 +0200
+
+ffmpeg-extra (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
+
+ * merge from 'main' package. Changes
+ - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 May 2010 07:49:18 +0200
+
ffmpeg (4:0.6~svn20100505-1ubuntu1) maverick; urgency=low
* merge from debian/experimental. remaining changes:
@@@ -214,26 -152,6 +234,26 @@@ ffmpeg (4:0.6~svn20100505-1) experiment
-- Reinhard Tartler <siretart at tauware.de> Sun, 24 Jan 2010 21:24:56 +0100
+ffmpeg-extra (4:0.5.1-2) unstable; urgency=low
+
+ [ Andres Mejia ]
+ * Prepare new upload for Debian.
+ * Update gbp.conf for master.extra branch.
+ * Bump Standards-Version to 3.8.4.
+ * Don't include build-depends-indep when only building arch-dependent
+ packages.
+ * Include ${misc:Depends} for all packages.
+ * Set the team as maintainers.
+
+ -- Andres Mejia <mcitadel at gmail.com> Sat, 08 May 2010 02:46:46 -0400
+
+ffmpeg-extra (4:0.5.1-1ubuntu1) lucid; urgency=low
+
+ * merge from 'main' package. Changes
+ - build against faad, dirac, libopenjpeg, x264, mp3lame and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 04 Mar 2010 13:08:25 +0100
+
ffmpeg (4:0.5.1-1ubuntu1) lucid; urgency=low
* merge from debian. remaining changes:
@@@ -272,33 -190,15 +292,33 @@@ 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
+ffmpeg-extra (4:0.5+svn20090706-5ubuntu4) lucid; urgency=low
* tighten build dependency on new x264 package
- * add x264 backport for ffmpeg 0.5
+ * add libx264 wrapper 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-extra (4:0.5+svn20090706-5ubuntu3) lucid; urgency=low
+
+ * rebuild for ffmpeg versioned symbols
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 19 Jan 2010 20:55:30 +0100
+
+ffmpeg-extra (4:0.5+svn20090706-5ubuntu2) lucid; urgency=low
+
+ * No-change rebuild against new dirac package synced from Debian
+
+ -- Iain Lane <laney at ubuntu.com> Sun, 17 Jan 2010 17:41:48 +0000
+
+ffmpeg-extra (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
+
+ * merge from 'ubuntu' branch
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 17 Jan 2010 09:34:54 +0100
+
ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
* merge from debian, remaining changes:
@@@ -402,12 -302,6 +422,12 @@@ ffmpeg (4:0.5+svn20090706-2ubuntu4) luc
-- Reinhard Tartler <siretart at tauware.de> Mon, 21 Dec 2009 23:57:34 +0100
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
+
+ * merge from 'ffmpeg' package
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 10 Nov 2009 13:18:24 +0100
+
ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
* security backports from ffmpeg trunk (Closes: #550442)
@@@ -422,27 -316,14 +442,27 @@@
-- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
-ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu3) karmic; urgency=low
+
+ * make the conflicts/replaces on the former -unstripped- variants
+ versioned so the -unstripped- and -extra- variants can actually be
+ coinstalled.
+ * remove references to obsolete 'cvs' packages. these have never existed
+ in ubuntu after all.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 16 Oct 2009 10:29:16 +0200
+
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
[ Reinhard Tartler ]
+ * merge from the 'ffmpeg' package
* 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
+ * Add missing Conflicts/Replaces to ensure a working upgrade patch from
+ intrepid/jaunty. LP: #418785
[ Loïc Minier ]
* Update config for karmic's armel toolchain.
@@@ -452,19 -333,7 +472,19 @@@
* 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
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 14 Oct 2009 09:15:50 +0200
+
+ffmpeg-extra (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
+
+ * merge from the 'ffmpeg' package
+ * enable dirac, libopenjpeg
+ * reintroduce the formats.txt file
+ * reintroduce "missing" codecs: LP: #419103
+ * is co-installable with the -dev packages LP: #416436, #418168
+ * should now have the proper replaces lines: LP: #418789, #418799, #418807, #323789
+ * don't build doxygen documentation, it is not installed anyway
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 11:50:32 +0200
ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
@@@ -593,15 -462,6 +613,15 @@@ ffmpeg-debian (4:0.5+svn20090609-1ubunt
-- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 21:53:47 +0200
+ffmpeg (4:0.5+svn20090609-1ubuntu1+unstripped1) karmic; urgency=low
+
+ * prepare new upload
+ * update gbp.conf
+ * move gbp.conf to debian/
+ * regroup build dependencies to minimize the diff
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 19:45:26 +0200
+
ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
* merge from debian. Remaining changes:
@@@ -807,24 -667,6 +827,24 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
-- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped3) jaunty; urgency=low
+
+ * add conflicts replaces for libavfilter0, LP: #322570
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 09 Mar 2009 18:24:56 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped2) jaunty; urgency=low
+
+ * add correct epoch in the "internal" shlibs generation
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 06 Feb 2009 15:24:58 +0100
+
+ffmpeg (3:0.svn20090204-2ubuntu1+unstripped1) jaunty; urgency=low
+
+ * rebuild using a clean, uncrippled ffmpeg tarball
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 21:45:05 +0100
+
ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
* merge from debian. Remaining changes:
@@@ -882,21 -724,6 +902,21 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped2) jaunty; urgency=low
+
+ * add conflicts/replaces on libavfilter0. LP: #323789
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 18:45:46 +0100
+
+ffmpeg (3:0.svn20090119-1ubuntu1+unstripped1) jaunty; urgency=low
+
+ * merge with the ubuntu.jaunty branch
+ * reenable x264 LP: #303537
+ * build against vdpau
+ * enable xvmc support
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 17:51:19 +0100
+
ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
* merge from debian. LP: #318501
@@@ -934,16 -761,6 +954,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
+ffmpeg (3:0.svn20081115-1ubuntu1+unstripped1) jaunty; urgency=low
+
+ * build unstripped version for multiverse.
+ * enable additional external libraries:
+ - libmp3lame-dev
+ - libfaac-dev
+ - libxvidcore-dev
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:50:42 +0100
+
ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
* merge from debian.
diff --combined debian/control
index 8b4ad51,27c61b6..b444e31
--- a/debian/control
+++ b/debian/control
@@@ -1,141 -1,259 +1,142 @@@
-Source: ffmpeg
+Source: ffmpeg-extra
Section: libs
Priority: optional
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>,
- Fabian Greffrath <fabian+debian at greffrath.com>,
- Andres Mejia <mcitadel at gmail.com>
+ Loic Minier <lool at dooz.org>,
+ Reinhard Tartler <siretart at tauware.de>,
+ Fabian Greffrath <fabian+debian at greffrath.com>,
+ Andres Mejia <mcitadel at gmail.com>,
+ Jonas Smedegaard <dr at jones.dk>
DM-Upload-Allowed: yes
Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg.git
Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg.git;a=summary
Homepage: http://ffmpeg.org/
-Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 7),
- libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libavcodec-dev,
- libavfilter-dev,
- libavformat-dev,
- libavutil-dev,
- libbz2-dev,
- libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libdirac-dev,
- libfaad-dev | libfaad2-dev,
- libfreetype6-dev,
- libgsm1-dev,
- libimlib2-dev,
- libmp3lame-dev,
- libopenjpeg-dev,
- libpostproc-dev,
- libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- librtmp-dev (>= 2.2e-4),
- librtmp-dev,
- libschroedinger-dev,
- libsdl1.2-dev,
- libspeex-dev,
- libtheora-dev (>> 0.0.0.alpha4),
- libva-dev,
- libvdpau-dev,
- libvorbis-dev,
- libvpx-dev,
- libx11-dev,
- libx264-dev (>> 1:0.svn20100213+gitfcf70c),
- libxext-dev,
- libxfixes-dev,
- libxvidcore-dev | libxvidcore4-dev,
- libxvmc-dev,
- quilt,
- texi2html,
- yasm [i386 amd64],
- zlib1g-dev
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ libavcodec-dev,
++ libavfilter-dev,
++ libavformat-dev,
++ libavutil-dev,
+ libbz2-dev,
+ libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ libdirac-dev,
++ libfaad-dev | libfaad2-dev,
+ libfreetype6-dev,
+ libgsm1-dev,
+ libimlib2-dev,
++ libmp3lame-dev,
++ libopenjpeg-dev,
++ libpostproc-dev,
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ librtmp-dev (>= 2.2e-4),
++ librtmp-dev,
+ libschroedinger-dev,
+ libsdl1.2-dev,
+ libspeex-dev,
+ libtheora-dev (>> 0.0.0.alpha4),
++ libva-dev,
++ libvdpau-dev,
+ libvorbis-dev,
++ libvpx-dev,
+ libx11-dev,
++ libx264-dev (>> 1:0.svn20100213+gitfcf70c),
+ libxext-dev,
+ libxfixes-dev,
- libvdpau-dev,
- libvpx-dev,
++ libxvidcore-dev | libxvidcore4-dev,
+ libxvmc-dev,
+ quilt,
+ texi2html,
+ yasm [i386 amd64],
- libva-dev,
+ zlib1g-dev
-Package: ffmpeg
-Section: video
-Architecture: any
-Replaces: libavcodec52 (<< ${source:Version}),
- libavcodec-extra-52 (<< 4:0.6~)
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: ffprobe
-Description: multimedia player, server and encoder
- This package contains the ffplay multimedia player, the ffserver streaming
- server and the ffmpeg audio and video encoder. They support most existing
- file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
- DivX, MPEG4, AC3, DV...).
-
-Package: ffmpeg-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libavutil50 (= ${binary:Version}),
- libavcodec52 (= ${binary:Version}),
- libavdevice52 (= ${binary:Version}),
- libpostproc51 (= ${binary:Version}),
- libavformat52 (= ${binary:Version}),
- 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.
- .
- Most people will not need this package. Please install it to produce useful
- stacktraces to help debugging the ffmpeg library.
-
-Package: ffmpeg-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.
-
-Package: libavutil50
+Package: libavutil-extra-50
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
+Conflicts: libavutil50
+Replaces: libavutil50
Description: ffmpeg utility library
This is the common utility library from the ffmpeg project. It is required
by all other ffmpeg libraries.
.
- This package contains a Debian-specific version of the libavutil shared
+ This package contains a unrestricted version of the libavutil shared
object that should only be used by Debian packages.
-Package: libavcodec52
+Package: libavcodec-extra-52
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
-Breaks: libavcodec51 (<< 3:0.svn20090303-1)
+Suggests: libfaad0
+Conflicts: libavcodec52
+Replaces: libavcodec52, ffmpeg (<< 4:0.5.1-1)
Description: ffmpeg codec library
This is the codec library from the ffmpeg project. It supports most existing
encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
.
- This package contains a Debian-specific version of the libavcodec shared
+ This package contains a unrestricted version of the libavcodec shared
object that should only be used by Debian packages.
-Package: libavdevice52
+Package: libavdevice-extra-52
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
+Conflicts: libavdevice52
+Replaces: libavdevice52
Description: ffmpeg device handling library
This is the device handling library from the ffmpeg project.
.
- This package contains a Debian-specific version of the libavdevice shared
- object that should only be used by Debian packages.
-
-Package: libavformat52
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Breaks: mplayer (<< 2:1.0~rc4~)
-Description: ffmpeg file format library
- This is the demuxer library from the ffmpeg project. It supports most
- existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
- .
- This package contains a Debian-specific version of the libavformat shared
+ This package contains a unrestricted version of the libavdevice shared
object that should only be used by Debian packages.
-Package: libavfilter1
+Package: libavfilter-extra-1
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
+Conflicts: libavfilter1
+Replaces: libavfilter1
Description: ffmpeg video filtering library
This is the video filtering library from the ffmpeg project.
.
- This package contains a Debian-specific version of the libavfilter shared
+ This package contains a unrestricted version of the libavfilter shared
object that should only be used by Debian packages.
-Package: libpostproc51
+Package: libpostproc-extra-51
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
+Conflicts: libpostproc51
+Replaces: libpostproc51
Description: ffmpeg video postprocessing library
This is the video postprocessing library from the ffmpeg project.
.
- This package contains a Debian-specific version of the libpostproc shared
+ This package contains a unrestricted version of the libpostproc shared
object that should only be used by Debian packages.
-Package: libswscale0
+Package: libavformat-extra-52
Architecture: any
Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
-Description: ffmpeg video scaling library
- This is the video scaling library from the ffmpeg project.
- .
- This package contains a Debian-specific version of the libswscale shared
- object that should only be used by Debian packages.
-
-Package: libavutil-dev
-Section: libdevel
-Architecture: any
-Depends: libavutil50 (>= ${binary:Version}) | libavutil-extra-50 (>= ${source:Upstream-Version}),
- 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 the ffmpeg project. It is required
- by all other ffmpeg libraries.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavutil.
-
-Package: libavcodec-dev
-Section: libdevel
-Architecture: any
-Depends: libavcodec52 (>= ${binary:Version}) | libavcodec-extra-52 (>= ${source:Upstream-Version}),
- libavcodec52 (<= ${source:Upstream-Version}-99) | libavcodec-extra-52 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
- ${misc:Depends}
-Suggests: libfaad-dev,
- libgsm1-dev,
- libogg-dev,
- libschroedinger-dev,
- libspeex-dev,
- libtheora-dev (>> 0.0.0.alpha4),
- libvorbis-dev,
- libx11-dev,
- libxext-dev,
- zlib1g-dev,
- ${lib1394-dev}
-Description: development files for libavcodec
- This is the codec library from the ffmpeg project. It supports most existing
- encoding formats (MPEG, DivX, MPEG4, AC3, DV...).
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavcodec.
-
-Package: libavdevice-dev
-Section: libdevel
-Architecture: any
-Depends: libavdevice52 (>= ${binary:Version}) | libavdevice-extra-52 (>= ${source:Upstream-Version}),
- libavdevice52 (<= ${source:Upstream-Version}-99) | libavdevice-extra-52 (<= ${source:Upstream-Version}-99),
- libavformat-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: development files for libavdevice
- This is the device handling library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavdevice.
-
-Package: libavformat-dev
-Section: libdevel
-Architecture: any
-Depends: libavformat52 (>= ${binary:Version}) | libavformat-extra-52 (>= ${source:Upstream-Version}),
- libavformat52 (<= ${source:Upstream-Version}-99) | libavformat-extra-52 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: development files for libavformat
+Conflicts: libavformat52
+Replaces: libavformat52
+Breaks: libavcodec51
+Description: ffmpeg file format library
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
.
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavformat.
-
-Package: libavfilter-dev
-Section: libdevel
-Architecture: any
-Depends: libavfilter1 (>= ${binary:Version}) | libavfilter-extra-1 (>= ${source:Upstream-Version}),
- libavfilter1 (<= ${source:Upstream-Version}-99) | libavfilter-extra-1 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: development files for libavfilter
- This is the video filtering library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavfilter.
-
-Package: libpostproc-dev
-Section: libdevel
-Architecture: any
-Depends: libpostproc51 (>= ${binary:Version}) | libpostproc-extra-51 (>= ${source:Upstream-Version}),
- libpostproc51 (<= ${source:Upstream-Version}-99) | libpostproc-extra-51 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: development files for libpostproc
- This is the video postprocessing library from the ffmpeg project.
- .
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libpostproc.
+ This package contains a unrestricted version of the libavformat shared
+ object that should only be used by Debian packages.
-Package: libswscale-dev
-Section: libdevel
+Package: libswscale-extra-0
Architecture: any
-Depends: libswscale0 (>= ${binary:Version}) | libswscale-extra-0 (>= ${source:Upstream-Version}),
- libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-0 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
-Description: development files for libswscale
+Conflicts: libswscale0
+Replaces: libswscale0
+Description: ffmpeg video scaling library
This is the video scaling library from the ffmpeg project.
.
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libswscale.
+ This package contains a unrestricted version of the libswscale shared
+ object that should only be used by Debian packages.
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list