[SCM] FFmpeg packaging branch, ubuntu.extra, updated. extra/debian/0.6-2ubuntu1
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jul 31 20:19:19 UTC 2010
The following commit has been merged in the ubuntu.extra branch:
commit 64f7fb2acba2431118ae8e9561cd9690573271e7
Merge: 5a3c444e7ebff511efa7dd2993b1979b144c8450 66ae34ba3cdbc63384c77417e1f845fc7f1945b6
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sun Jul 11 11:47:57 2010 -0400
Merge branch 'ubuntu' into ubuntu.extra
Conflicts:
debian/changelog
debian/control
debian/rules
diff --combined debian/changelog
index 4dacb08,768adb3..89f420d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,36 +1,43 @@@
+ ffmpeg (4:0.6-2ubuntu1) maverick; urgency=low
+
+ * merge from debian/experimental. remaining changes:
+ - don't disable encoders
+ - don't build against libfaad, libdirac, librtmp and libopenjpeg (all in universe)
+
+ -- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jul 2010 11:00:54 -0400
+
+ ffmpeg (4:0.6-2) experimental; urgency=low
+
+ [ Fabian Greffrath ]
+ * Enable RTMP[E] support via librtmp.
+ * Disable aac encoder, see README.Debian.
+ * Fix obsolete-relation-form for the internal dependencies.
+ * Merge debian/README.Source into debian/README.source and add section
+ headers.
+ * Remove obsoleted support for the non-free libamr-nb/wb.
+
+ [ Reinhard Tartler ]
+ * enable runtime-cpudetect
+ * conditionally build against opencore-amr if installed in the build
+ environment
+ * update upstream url in debian/copyright
+ * fix usage documentation in debian/get-orig-source.sh
+ * update dep3 headers for debian/patches/900_doxyfile
+ * add proper replaces for moving presets back to ffmpeg
+ * make debian/patches gbp-pq friendly
+ * Add VP80 fourcc to libavformat/riff.c
+ * Backport-AAC-HE-v2
+ * bump Standards-Version, no changes needed
+
+ -- 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:
@@@ -33,40 -59,6 +66,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:
@@@ -92,26 -84,6 +125,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:
@@@ -150,33 -122,15 +183,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:
@@@ -280,12 -234,6 +313,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)
@@@ -300,27 -248,14 +333,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.
@@@ -330,19 -265,7 +363,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
@@@ -471,15 -394,6 +504,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:
@@@ -685,24 -599,6 +718,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:
@@@ -760,21 -656,6 +793,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
@@@ -812,16 -693,6 +845,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/confflags
index e7229ef,96c1871..5a727d1
--- a/debian/confflags
+++ b/debian/confflags
@@@ -82,9 -82,7 +82,9 @@@ confflags += --enable-avfilte
confflags += --enable-avfilter-lavf
confflags += --enable-vdpau
confflags += --enable-bzlib
+confflags += --enable-libdirac
confflags += --enable-libgsm
+confflags += --enable-libopenjpeg
confflags += --enable-libschroedinger
confflags += --enable-libspeex
confflags += --enable-libtheora
@@@ -104,12 -102,9 +104,9 @@@ confflags += $(extra_common_confflags
# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
- confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
gpl_confflags += $(call cond_enable,/usr/include/x264.h,libx264)
-
+ gpl_confflags += $(call cond_enable,/usr/include/librtmp/http.h,librtmp)
confflags += $(call cond_enable,/usr/include/lame/lame.h,libmp3lame)
- confflags += $(call cond_enable_nf,/usr/include/amrnb/sp_dec.h,libamr-nb)
- confflags += $(call cond_enable_nf,/usr/include/amrwb/dec.h,libamr-wb)
# Opencore-amr requires GPL v3
v3_confflags += $(call cond_enable_v3,/usr/include/opencore-amrnb/interf_dec.h,libopencore-amrnb)
diff --combined debian/control
index 045418e,d978eef..812a0ad
--- a/debian/control
+++ b/debian/control
@@@ -1,4 -1,4 +1,4 @@@
-Source: ffmpeg
+Source: ffmpeg-extra
Section: libs
Priority: optional
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss at lists.ubuntu.com>
@@@ -9,37 -9,26 +9,38 @@@ Uploaders: Sam Hocevar (Debian packages
Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <mcitadel at gmail.com>
DM-Upload-Allowed: yes
- Standards-Version: 3.8.4
+ Standards-Version: 3.9.0
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,
+ libopenjpeg-dev,
libimlib2-dev,
+ libmp3lame-dev,
+ libopenjpeg-dev,
+ libpostproc-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
++ librtmp-dev (>= 2.2e-4),
libschroedinger-dev,
libsdl1.2-dev,
libspeex-dev,
libtheora-dev (>> 0.0.0.alpha4),
libvorbis-dev,
libx11-dev,
+ libx264-dev (>> 1:0.svn20100213+gitfcf70c),
libxext-dev,
+ libxvidcore-dev | libxvidcore4-dev,
libvdpau-dev,
libvpx-dev,
libxvmc-dev,
@@@ -49,128 -38,220 +50,128 @@@
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}
+Conflicts: libavutil50, libavutil-unstripped-50 (<< ${binary:Version})
+Replaces: libavutil50, libavutil-unstripped-50 (<< ${binary:Version})
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: libavutil-unstripped-50
+Architecture: any
+Depends: libavutil-extra-50 (= ${binary:Version}), ${misc:Depends}
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
+
+Package: libavcodec-extra-52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
-Replaces: ffmpeg (<< 4:0.5.1-1)
+Suggests: libfaad0
+Conflicts: libavcodec52, libavcodec-unstripped-52 (<< ${binary:Version})
+Replaces: libavcodec52, libavcodec-unstripped-52 (<< ${binary:Version}), 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: libavcodec-unstripped-52
+Architecture: any
+Depends: libavcodec-extra-52 (= ${binary:Version}), ${misc:Depends}
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
+
+Package: libavdevice-extra-52
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+Conflicts: libavdevice52, libavdevice-unstripped-52 (<< ${binary:Version})
+Replaces: libavdevice52, libavdevice-unstripped-52 (<< ${binary:Version})
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
+ This package contains a unrestricted version of the libavdevice shared
object that should only be used by Debian packages.
-Package: libavformat52
+Package: libavdevice-unstripped-52
Architecture: any
-Depends: ${shlibs:Depends},
- ${misc:Depends}
-Breaks: libavcodec51 (<< 3:0.svn20090303-1)
-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
- object that should only be used by Debian packages.
+Depends: libavdevice-extra-52 (= ${binary:Version}), ${misc:Depends}
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libavfilter1
+Package: libavfilter-extra-1
Architecture: any
Depends: ${shlibs: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}
+Conflicts: libpostproc51, libpostproc-unstripped-51 (<< ${binary:Version})
+Replaces: libpostproc51, libpostproc-unstripped-51 (<< ${binary:Version})
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
- object that should only be used by Debian packages.
-
-Package: libswscale0
-Architecture: any
-Depends: ${shlibs: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
+ This package contains a unrestricted version of the libpostproc 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
+Package: libpostproc-unstripped-51
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.
+Depends: libpostproc-extra-51 (= ${binary:Version}), ${misc:Depends}
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libavdevice-dev
-Section: libdevel
+Package: libavformat-extra-52
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}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: development files for libavformat
+Conflicts: libavformat52, libavformat-unstripped-52 (<< ${binary:Version})
+Replaces: libavformat52, libavformat-unstripped-52 (<< ${binary:Version})
+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.
+ This package contains a unrestricted version of the libavformat shared
+ object that should only be used by Debian packages.
-Package: libavfilter-dev
-Section: libdevel
+Package: libavformat-unstripped-52
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.
+Depends: libavformat-extra-52 (= ${binary:Version}), ${misc:Depends}
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
-Package: libpostproc-dev
-Section: libdevel
+Package: libswscale-extra-0
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}),
+Depends: ${shlibs:Depends},
${misc:Depends}
-Description: development files for libpostproc
- This is the video postprocessing library from the ffmpeg project.
+Conflicts: libswscale0, libswscale-unstripped-0 (<< ${binary:Version})
+Replaces: libswscale0, libswscale-unstripped-0 (<< ${binary:Version})
+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 libpostproc.
+ This package contains a unrestricted version of the libswscale shared
+ object that should only be used by Debian packages.
-Package: libswscale-dev
-Section: libdevel
+Package: libswscale-unstripped-0
Architecture: any
-Depends: libswscale0 (>= ${binary:Version}) | libswscale-extra-1 (>= ${source:Upstream-Version}),
- libswscale0 (<= ${source:Upstream-Version}-99) | libswscale-extra-1 (<= ${source:Upstream-Version}-99),
- libavutil-dev (= ${binary:Version}),
- ${misc:Depends}
-Description: development files for libswscale
- 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.
+Depends: libswscale-extra-0 (= ${binary:Version}), ${misc:Depends}
+Description: ffmpeg utility library - transitional package
+ This package can be safely removed if no other packages depend on this
+
diff --combined debian/rules
index 395ad75,534f5fb..d1844c1
--- a/debian/rules
+++ b/debian/rules
@@@ -6,7 -6,7 +6,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.6~svn20100505-1
+ SHLIBS_VERSION := 4:0.6-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)
@@@ -85,9 -85,16 +85,9 @@@ install: buil
dh_testdir
dh_testroot
dh_prep
- dh_installdirs -ptmp usr/share/doc/ffmpeg/html etc
- dh_installdirs -ptmp usr/share/doc/ffmpeg-doc/html
$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
- install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
- # don't fail on binary-indep only builds.
- [ ! -d doxy ] || cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/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/ffmpeg-doc -Xusr/share/doc/ffmpeg \
- --fail-missing --sourcedir=debian/tmp
+ --warn-missing --sourcedir=debian/tmp
formats.txt: install
env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
@@@ -97,32 -104,37 +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_installdocs $(extradoc) doc/optimization.txt
dh_installdocs -A MAINTAINERS CREDITS doc/TODO
dh_installdocs -A debian/README.Debian
- dh_installdocs -p libavcodec52 codecs.txt
- dh_installdocs -p libavformat52 formats.txt
- dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
- dh_installexamples -plibavcodec-dev libavcodec/api-example.c
+ dh_installdocs -p libavcodec-extra-52 codecs.txt
+ dh_installdocs -p libavformat-extra-52 formats.txt
dh_installchangelogs Changelog
dh_lintian
dh_link
dh_compress
dh_fixperms
- dh_strip --dbg-package=ffmpeg-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 (>= $(DEB_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)"
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list