[SCM] ffmpeg/ubuntu.extra: Merge branch 'ubuntu' into ubuntu.extra
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Wed Jun 22 09:00:34 UTC 2011
update debian/changelog
Merge 4:0.7-1 into ubuntu
update debian/changelog
Bump Standards-Version
update debian/changelog
bump shlibs
bump libswscale SONAME
Merge branch 'upstream'
Imported Upstream version 0.7
add debian/source/local-options
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: dee2e1e59255886f6e70cfb63f44c32515ab9e84
X-Git-Newrev: b9d5a7078d73adcd139105f2d81d572ab2b57349
The following commit has been merged in the ubuntu.extra branch:
commit eaff13128fd5320789c70b1b28a1cd28fda3bf7b
Merge: dee2e1e59255886f6e70cfb63f44c32515ab9e84 2f37083510771e20401649f7eb9bbe33f1b43206
Author: Reinhard Tartler <siretart at tauware.de>
Date: Wed Jun 22 10:50:10 2011 +0200
Merge branch 'ubuntu' into ubuntu.extra
diff --combined debian/changelog
index 44f028d,6539aaa..c1222ee
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,23 +1,30 @@@
+ libav (4:0.7-1ubuntu1) oneiric; 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> Wed, 22 Jun 2011 10:47:22 +0200
+
+ libav (4:0.7-1) experimental; urgency=low
+
+ * New upstream release.
+ * Fixes several potential security issues, Closes: #628448
+ * Much imporved libavfilter, Closes: #594108
+ * Fixes some overlapping memcpys my using memmove instead, Closes: #627818
+ * Bump libswscale SONAME
+ * Bump shlibs
+ * Bump Standards version to 3.9.2
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 21 Jun 2011 07:49:59 +0200
+
+libav-extra (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jun 2011 17:10:08 +0200
+
libav (4:0.7~rc1-1ubuntu1) oneiric; urgency=low
* Merge from debian. Remaining changes:
@@@ -89,19 -102,6 +109,19 @@@ libav (4:0.7~b1-1) experimental; urgenc
-- Reinhard Tartler <siretart at tauware.de> Tue, 19 Apr 2011 15:04:55 +0200
+libav-extra (4:0.6.2-1ubuntu2) natty; urgency=low
+
+ * fix path to powerpc extradoc
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 24 Mar 2011 15:42:35 +0100
+
+libav-extra (4:0.6.2-1ubuntu1) natty; urgency=low
+
+ * rename to libav-extra
+ * remove all sources from branch and rely on libav-source package instead
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 10:48:16 +0100
+
libav (4:0.6.2-1ubuntu1) natty; urgency=low
* Merge from debian. Remaining changes:
@@@ -113,14 -113,6 +133,14 @@@
-- Reinhard Tartler <siretart at tauware.de> Sun, 20 Mar 2011 12:09:31 +0100
+ffmpeg-extra (4:0.6.1-2ubuntu1) natty; urgency=low
+
+ * merge from 'main' package. Changes:
+ - build against faad, dirac, libopenjpeg, x264, mp3lame, librtmp and xvidcore
+ * force upgrade of the mplayer package
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 19 Nov 2010 12:15:19 +0100
+
libav (4:0.6.2-1) unstable; urgency=medium
[ Reinhard Tartler ]
@@@ -206,13 -198,6 +226,13 @@@ ffmpeg (4:0.6.1-2) experimental; urgenc
-- 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:
@@@ -231,26 -216,6 +251,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
@@@ -281,20 -246,6 +301,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:
@@@ -328,13 -279,6 +348,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:
@@@ -363,40 -307,6 +383,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:
@@@ -499,26 -409,6 +519,26 @@@ ffmpeg (4:0.5.1-2) unstable; urgency=lo
-- Reinhard Tartler <siretart at tauware.de> Wed, 10 Mar 2010 21:19:40 +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:
@@@ -557,33 -447,15 +577,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:
@@@ -687,12 -559,6 +707,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)
@@@ -707,27 -573,14 +727,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.
@@@ -737,19 -590,7 +757,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
@@@ -878,15 -719,6 +898,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:
@@@ -1092,24 -924,6 +1112,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:
@@@ -1167,21 -981,6 +1187,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
@@@ -1219,16 -1018,6 +1239,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 3636e91,4b01eb7..a86178b
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
-Source: libav
+Source: libav-extra
Section: libs
Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
@@@ -10,25 -10,20 +10,25 @@@ Uploaders: Sam Hocevar (Debian packages
Andres Mejia <mcitadel at gmail.com>,
Jonas Smedegaard <dr at jones.dk>
DM-Upload-Allowed: yes
- Standards-Version: 3.9.1
+ Standards-Version: 3.9.2
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),
libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libav-source (>= 4:0.7~rc1-1ubuntu1),
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,
libjack-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
libsdl1.2-dev,
libspeex-dev,
@@@ -38,101 -33,249 +38,101 @@@
libvorbis-dev,
libvpx-dev,
libx11-dev,
+ libx264-dev (>> 1:0.svn20100213+gitfcf70c),
libxext-dev,
libxfixes-dev,
+ libxvidcore-dev | libxvidcore4-dev,
libxvmc-dev,
texi2html,
yasm [amd64 i386 kfreebsd-amd64 kfreebsd-i386 mips mipsel s390 sparc powerpc],
zlib1g-dev
-Package: ffmpeg
-Section: video
+Package: libavutil-extra-51
Architecture: any
-Replaces: libavcodec53 (<< ${source:Version}),
- libavcodec-extra-53 (<< 4:0.6~)
Depends: ${shlibs:Depends},
- ${misc:Depends}
-Conflicts: ffprobe
-Description: Multimedia player, server, encoder and transcoder
- 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: libav-dbg,
- ${misc:Depends}
-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: libavutil51 (= ${binary:Version}),
- libavcodec53 (= ${binary:Version}),
- libavdevice53 (= ${binary:Version}),
- libpostproc52 (= ${binary:Version}),
- libavformat53 (= ${binary:Version}),
- libswscale2 (= ${binary:Version}),
- ffmpeg (= ${binary:Version}),
- ${misc:Depends}
-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 library.
-
-Package: libav-source
-Architecture: all
-Section: devel
-Depends: ${misc:Depends}
-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,
- ${misc:Depends}
-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}
-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.
-
-Package: libavutil51
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
+ ${misc:Depends}
+Conflicts: libavutil51
+Replaces: libavutil51
Description: Libav utility library
- This is the common utility library from Libav. It contains shared code
- used by all other Libav libraries.
+ This is the common utility library from the Libav project. It is required
+ by all other Libav libraries.
+ .
+ This package contains a unrestricted version of the libavutil shared
+ object that should only be used by Debian packages.
-Package: libavcodec53
+Package: libavcodec-extra-53
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Suggests: libfaad0
+Conflicts: libavcodec53
+Replaces: libavcodec53
Description: Libav codec library
- This is the codec library from Libav (both encoding and decoding).
+ This package contains the ffplay multimedia player, the ffserver streaming
+ server and the Libav audio and video encoder. They support most existing
+ file formats (AVI, MPEG, OGG, Matroska, ASF...) and encoding formats (MPEG,
+ DivX, MPEG4, AC3, DV...).
.
- It supports most existing codecs (MPEG, MPEG2, MPEG4, AC3, DV...).
+ This package contains a unrestricted version of the libavcodec shared
+ object that should only be used by Debian packages.
-Package: libavdevice53
+Package: libavdevice-extra-53
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavdevice53
+Replaces: libavdevice53
Description: Libav device handling library
- This is the device handling library from Libav.
-
-Package: libavformat53
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Libav file format library
- This is the library for handling file formats from Libav.
+ This is the device handling library from the Libav project.
.
- It supports most existing file formats (AVI, MPEG, OGG, Matroska,
- ASF...).
-
-Package: libavfilter2
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Libav video filtering library
- This is the video filtering library from Libav.
+ This package contains a unrestricted version of the libavdevice shared
+ object that should only be used by Debian packages.
-Package: libpostproc52
+Package: libavfilter-extra-2
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavfilter2
+Replaces: libavfilter2
Description: Libav video postprocessing library
This is the video postprocessing library from Libav.
-
-Package: libswscale2
-Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Description: Libav video scaling library
- This is the video software scaling library from Libav.
-
-Package: libavutil-dev
-Section: libdevel
-Architecture: any
-Depends: libavutil51 (>= ${binary:Version}) | libavutil-extra-51 (>= ${source:Upstream-Version}),
- libavutil51 (<= ${source:Upstream-Version}-99) | libavutil-extra-51 (<= ${source:Upstream-Version}-99),
- ${misc:Depends}
-Description: Development files for libavutil
- 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.
-
-Package: libavcodec-dev
-Section: libdevel
-Architecture: any
-Depends: libavcodec53 (>= ${binary:Version}) | libavcodec-extra-53 (>= ${source:Upstream-Version}),
- libavcodec53 (<= ${source:Upstream-Version}-99) | libavcodec-extra-53 (<= ${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 Libav. 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.
+ This package contains a unrestricted version of the libavfilter shared
+ object that should only be used by Debian packages.
-Package: libavdevice-dev
-Section: libdevel
+Package: libpostproc-extra-52
Architecture: any
-Depends: libavdevice53 (>= ${binary:Version}) | libavdevice-extra-53 (>= ${source:Upstream-Version}),
- libavdevice53 (<= ${source:Upstream-Version}-99) | libavdevice-extra-53 (<= ${source:Upstream-Version}-99),
- libavformat-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavdevice
- This is the device handling library from Libav.
+Conflicts: libpostproc52
+Replaces: libpostproc52
+Description: Libav video postprocessing library
+ This is the video postprocessing library from the Libav project.
.
- This package contains the header files and static libraries needed to
- compile applications or shared objects that use libavdevice.
+ This package contains a unrestricted version of the libpostproc shared
+ object that should only be used by Debian packages.
-Package: libavformat-dev
-Section: libdevel
+Package: libavformat-extra-53
Architecture: any
-Depends: libavformat53 (>= ${binary:Version}) | libavformat-extra-53 (>= ${source:Upstream-Version}),
- libavformat53 (<= ${source:Upstream-Version}-99) | libavformat-extra-53 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libavformat
- This is the demuxer library from Libav. It supports most
+Conflicts: libavformat53
+Replaces: libavformat53
+Description: Libav file format library
+ This is the demuxer library from the Libav 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: libavfilter2 (>= ${binary:Version}) | libavfilter-extra-2 (>= ${source:Upstream-Version}),
- libavfilter2 (<= ${source:Upstream-Version}-99) | libavfilter-extra-2 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: Development files for libavfilter
- 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.
+ This package contains a unrestricted version of the libavformat shared
+ object that should only be used by Debian packages.
-Package: libpostproc-dev
-Section: libdevel
+Package: libswscale-extra-1
Architecture: any
-Depends: libpostproc52 (>= ${binary:Version}) | libpostproc-extra-52 (>= ${source:Upstream-Version}),
- libpostproc52 (<= ${source:Upstream-Version}-99) | libpostproc-extra-52 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: Development files for libpostproc
- 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.
-
-Package: libswscale-dev
-Section: libdevel
-Architecture: any
-Depends: libswscale2 (>= ${binary:Version}) | libswscale-extra-1 (>= ${source:Upstream-Version}),
- libswscale2 (<= ${source:Upstream-Version}-99) | libswscale-extra-1 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: Development files for libswscale
- This is the video scaling library from Libav.
+Conflicts: libswscale1
+Replaces: libswscale1
+Description: Libav video scaling library
+ This is the video scaling library from the Libav 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.
diff --combined debian/rules
index cdcb59e,fc1970e..5b4c5bc
--- a/debian/rules
+++ b/debian/rules
@@@ -4,7 -4,7 +4,7 @@@ EPOCH=4
DEB_SOURCE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
- SHLIBS_VERSION := 4:0.7~~
+ SHLIBS_VERSION := 4:0.7-1
LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
@@@ -32,14 -32,11 +32,14 @@@ snapshot_version
cp .svnrevision $@
touch $@
+libav/configure:
+ tar xvf /usr/src/libav-source.tar.gz
+
configure-%: configure-stamp-%
-configure-stamp-%: $(QUILT_STAMPFN) snapshot_version
+configure-stamp-%: snapshot_version libav/configure
dh_testdir
mkdir -p debian-$*
- cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+ cd debian-$* && CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/libav/configure \
$($*_build_confflags) $(extra_$*_build_confflags)
touch $@
@@@ -53,7 -50,7 +53,7 @@@ debian-shared/tools/qt-faststart: build
$(MAKE) -C debian-shared tools/qt-faststart V=1
build-doxy: build-doxy-stamp
-build-doxy-stamp: $(QUILT_STAMPFN)
+build-doxy-stamp:
dh_testdir
doxygen
touch $@
@@@ -67,7 -64,7 +67,7 @@@ clean
rm -f build-stamp $(addprefix build-stamp-, $(FLAVORS)) \
$(addprefix configure-stamp-, $(FLAVORS)) \
build-doxy-stamp
- rm -rf $(addprefix debian-, $(FLAVORS)) doxy
+ rm -rf $(addprefix debian-, $(FLAVORS)) doxy libav
dh_clean
get-orig-source:
@@@ -85,9 -82,20 +85,9 @@@ install: buil
dh_testdir
dh_testroot
dh_prep
- dh_installdirs -ptmp usr/src
- tar czvf debian/tmp/usr/src/libav-source.tar.gz . \
- --exclude 'debian*' --exclude .git --exclude .pc --exclude '*-stamp' \
- --transform 's,^./,libav/,'
- dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
- dh_installdirs -ptmp usr/share/doc/libav-doc/html
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
- # don't fail on binary-indep only builds.
- [ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
- install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
- install -m 644 -D doc/ffserver.conf debian/tmp/etc/
- install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
- dh_install -Xusr/share/doc/libav-doc -Xusr/share/doc/ffmpeg \
- --fail-missing --sourcedir=debian/tmp
+ dh_install -Xusr/share/doc/ffmpeg-doc -Xusr/share/doc/ffmpeg \
+ --warn-missing --sourcedir=debian/tmp
formats.txt: install
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
@@@ -97,32 -105,41 +97,32 @@@ codecs.txt: instal
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
debian/tmp/usr/bin/ffmpeg -codecs | tee $@
-binary-indep: build-doxy install
+binary-indep: install
binary-arch: build install codecs.txt formats.txt
dh_testdir
dh_testroot
- dh_installman -pffmpeg debian/qt-faststart.1
- dh_installdocs doc/optimization.txt
- dh_installdocs -A CREDITS doc/TODO
+ dh_installdocs $(extradoc) libav/doc/optimization.txt
+ dh_installdocs -A libav/CREDITS libav/doc/TODO
dh_installdocs -A debian/README.Debian
- dh_installdocs -p libavcodec52 codecs.txt
- dh_installdocs -p libavformat52 formats.txt
- dh_installdocs -p libavcodec-dev -plibavdevice-dev \
- -plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
- -plibswscale-dev -plibavutil-dev -plibav-doc \
- doc/APIchanges
- dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
- dh_installexamples -plibavcodec-dev libavcodec/api-example.c
- dh_installchangelogs Changelog
+ dh_installdocs -p libavcodec-extra-52 codecs.txt
+ dh_installdocs -p libavformat-extra-52 formats.txt
+ dh_installchangelogs libav/Changelog
dh_lintian
dh_link
dh_compress
dh_fixperms
- dh_strip --dbg-package=libav-dbg
+ dh_strip
# strict internal dependencies
for pkg in $(LIB_PKGS); do \
- upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99)"; \
done
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
dh_shlibdeps
# target dependencies for external packages
for pkg in $(LIB_PKGS); do \
- upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
- dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+ dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
done
dh_installdeb
dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list