[SCM] FFmpeg packaging branch, ubuntu, updated. debian/0.5+svn20090706-3-16-g047264a
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat Jan 16 09:43:05 UTC 2010
The following commit has been merged in the ubuntu branch:
commit 047264a9a7bf1602f378a965ab3a77982354f6b3
Merge: 5a8466d1451d378560dfba675a5cdaed093b1436 884239855f6b325a9b1cf7771154e74293d40244
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Jan 16 10:41:56 2010 +0100
Merge branch 'master' into ubuntu
diff --combined debian/changelog
index d69e38a,a5178f5..b427726
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,5 -1,6 +1,16 @@@
- ffmpeg (4:0.5+svn20090706-2ubuntu5) lucid; urgency=low
++ffmpeg (4:0.5+svn20090706-5ubuntu1) lucid; urgency=low
+
++ * merge from debian, remaining changes:
++ - dont disable internal encoders
++ - disabled extra depedencies (come with ffmpeg-extra)
++ - libdirac
++ - libopenjpeg
++
++ -- Reinhard Tartler <siretart at tauware.de> Sat, 16 Jan 2010 10:12:15 +0100
++
+ ffmpeg (4:0.5+svn20090706-4) unstable; urgency=low
+
+ [ Loïc Minier ]
* Use default toolchain setup on ARM flavors for noopt and only add FPU
CFLAGS in the VFP and NEON flavors; this is ok since internally, cpu will
be set to "generic" but -march=generic or -mcpu=generic will NOT be added
@@@ -16,74 -17,54 +27,118 @@@
--enable-armvfp on ARM since the upstream configure script will do the
right thing when the proper flags are set.
- [ Reinhard Tartler ]
- * build with PIC on powerpc (Closes: #561956)
-
- -- Reinhard Tartler <siretart at tauware.de> Fri, 15 Jan 2010 21:46:49 +0100
+ -- Loïc Minier <lool at dooz.org> Wed, 13 Jan 2010 12:57:32 +0100
+ ffmpeg (4:0.5+svn20090706-3) experimental; urgency=low
+
+ [ Loïc Minier ]
+ * Disable more autodetecter ARM arch features
+ * Enable neon flavour
+ * Update NEON confflags to assume v7 and VFP
+ * Add backported NEON patches from ffmpeg trunk
+ * Pass proper --cpu and --extra-flags on armel
+ * Pass -fPIC -DPIC to neon pass
+
+ [ Fabian Greffrath ]
+ * Initialize the FLAVORS variable to static instead of appending to
+ it. Also, we do not support the internalencoders variable anymore.
+
+ [ Andres Mejia ]
+ * Remove unused patches from packaging.
+ * Update Vcs-* entries to new location.
+ * Bump Standards-Version to 3.8.3.
+
+ [ Reinhard Tartler ]
+ * change shlibs file to make applications depend on the -extra- packages
+ * loosen dependencies further, so that the -dev packages remain
+ installable even if ffmpeg-extra is 'out-of-date'
+ * add patch for issue1245: Make arguments of av_set_pts_info() unsigned.
+ * Support constant-quant encoding for libtheora, LP: #356322
+ * increase swscale compile time width (VOF/VOFW), LP: #443264
+ * Backports of various security patches, Closes: #550442, including:
+ - backport fixes for vorbis_dec
+ - backport oggparsevorbis fix
+ - backport vp3 fixes
+ - backport ffv1 fix
+ - libavcodec/mpegaudiodec.c backports
+ - h264 security backports
+ - backported libavformat/mov.c security fixes
+ - backported libavformat/oggdec.c security fixes
+ - backport svn r18016 aka 'MOV-Support-stz2-Compact-Sample-Size-Box'
+ to fix FTBFS
+ * enable symbol versioning
+ * bump shlibs version
+ * add README.source describing how this source package manages patches
+ * make sure the ${misc:Depends} substvar is used for each binary package
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 06 Jan 2010 16:27:40 +0100
++
+ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa2) lucid; urgency=low
+
+ * export *all* symbols of libswscale, fixes FTBFS in mplayer
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 23:37:21 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu5~ppa1) lucid; urgency=low
+
+ * Imported Debian patch 0.5+svn20090706-2ubuntu4
+ * revert gbp.conf to point to lucid branch
+ * enable symbol versioning
+ * bump shlibs version
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 02 Jan 2010 15:03:09 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu4) lucid; urgency=low
+
+ * add build dependency on 'yasm', since it is now moved to main.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 21 Dec 2009 23:57:34 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu3) lucid; urgency=low
+
+ * security backports from ffmpeg trunk (Closes: #550442)
+ - libavcodec/mpegaudiodec
+ - libavcodec/vorbis_dec
+ - libavcodec/ffv1
+ - libavcodec/vp3
+ - libavcodec/h264
+ - libavformat/mov
+ - libavformat/oggdec
+ - libavformat/oggparsevorbis
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Nov 2009 20:31:29 +0100
+
+ffmpeg (4:0.5+svn20090706-2ubuntu2) karmic; urgency=low
+
+ [ Reinhard Tartler ]
+ * 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
+
+ [ Loïc Minier ]
+ * Update config for karmic's armel toolchain.
+ * Enable neon flavour; LP: #383240.
+ * Update NEON confflags to assume v7 and VFP.
+ * Add backported NEON patches from ffmpeg trunk; see debian/patches/neon/.
+ * 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
+
+ffmpeg (4:0.5+svn20090706-2ubuntu1) karmic; urgency=low
+
+ * merge from debian. Remaining changes:
+ - disabled output decoders: faad, openjpeg, dirac (all not in main)
+ - build arm vfp variant
+ - don't build depend on yasm.
+ * fix dependencies on -extra packages: LP: #418705, #416348
+ * no need to remove mpeg encoders in the ubuntu package, unless we hear
+ otherwise from some patent owner. This brings back the mpeg2video
+ encoder is available. cf. formats.txt.gz LP: #416585
+
+ -- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 11:20:03 +0200
ffmpeg (4:0.5+svn20090706-2) unstable; urgency=low
@@@ -100,30 -81,6 +155,30 @@@
-- Reinhard Tartler <siretart at tauware.de> Wed, 26 Aug 2009 09:12:49 +0200
+ffmpeg (4:0.5+svn20090706-1ubuntu3) karmic; urgency=low
+
+ * update the dependencies of the -dev packages for the
+ unstripped -> extra renaming
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 25 Aug 2009 16:37:23 +0200
+
+ffmpeg (4:0.5+svn20090706-1ubuntu2) karmic; urgency=low
+
+ * really drop libopenjpeg from build depends.
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 25 Aug 2009 08:17:17 +0200
+
+ffmpeg (4:0.5+svn20090706-1ubuntu1) karmic; urgency=low
+
+ * merge from debian. Remaining changes:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+ - build arm vfp variant
+ - don't build libopenjpeg support (not in main)
+ * change shlibs file to make applications depend on the -extra- packages.
+ * don't build depend on yasm.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Aug 2009 18:18:23 +0200
+
ffmpeg (4:0.5+svn20090706-1) unstable; urgency=low
* preparing new upstream version, 0.5 release branch, rev 19352
@@@ -184,31 -141,6 +239,31 @@@ ffmpeg-debian (4:0.5+svn20090609-2) uns
-- Reinhard Tartler <siretart at tauware.de> Thu, 13 Aug 2009 12:46:46 +0200
+ffmpeg-debian (4:0.5+svn20090609-1ubuntu3) karmic; urgency=low
+
+ * do not forcefully enable objenjpeg, it is not avaiable in this build
+ anyway
+ * don't build against faac in any case, it is deemed non-free
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 25 Jul 2009 09:15:12 +0200
+
+ffmpeg-debian (4:0.5+svn20090609-1ubuntu2) karmic; urgency=low
+
+ * remove libopenjpeg-dev from build depends (fixes FTBFS)
+ * remove duplicate libxvmc-dev build-dependency
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 24 Jul 2009 21:53:47 +0200
+
+ffmpeg-debian (4:0.5+svn20090609-1ubuntu1) karmic; urgency=low
+
+ * merge from debian. Remaining changes:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+ - build arm vfp variant
+ * update gbp.conf
+ * move gbp.conf to debian/
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 18 Jul 2009 10:55:24 +0200
+
ffmpeg-debian (4:0.5+svn20090609-1) unstable; urgency=low
[ Andres Mejia ]
@@@ -323,49 -255,6 +378,49 @@@ ffmpeg-debian (4:0.5+svn20090420-1) uns
-- Reinhard Tartler <siretart at tauware.de> Sat, 02 May 2009 09:09:54 +0200
+ffmpeg-debian (3:0.svn20090303-1ubuntu6) jaunty; urgency=low
+
+ * vfp CFLAGS: add "-mfpu=vfp -mfloat-abi=softfp".
+
+ -- Loic Minier <lool at dooz.org> Fri, 10 Apr 2009 21:34:29 +0200
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu5) jaunty; urgency=low
+
+ * Disable more autodetected ARM arch features.
+ * Add neon and vfp flavors to armel disabled for now.
+ * Enable vfp pass on armel; leave the neon disabled.
+
+ -- Loïc Minier <lool at dooz.org> Fri, 10 Apr 2009 17:58:52 +0200
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu4) jaunty; urgency=low
+
+ * brown paperbag upload. Actually include the patch intended for the
+ last upload.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Mar 2009 14:55:46 +0100
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu3) jaunty; urgency=low
+
+ * don't disable ffserver in specialised flavors. Fixes LP: #345370
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 21 Mar 2009 14:52:25 +0100
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu2) jaunty; urgency=low
+
+ * No-change rebuild to fix lpia shared library dependencies.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Thu, 19 Mar 2009 17:26:36 +0000
+
+ffmpeg-debian (3:0.svn20090303-1ubuntu1) jaunty; urgency=low
+
+ * FFE granted in LP: #340303.
+
+ * merge from debian/unstable.
+ * remaining changes to debian:
+ - don't build-depend on libfaad-dev, disabling faad decoder.
+
+ -- Reinhard Tartler <siretart at tauware.de> Fri, 13 Mar 2009 08:54:33 +0100
+
ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
* New Upstream Version (svn revision 17737 libswscale revision 28799)
@@@ -404,13 -293,6 +459,13 @@@ ffmpeg-debian (3:0.svn20090204-3) unsta
-- Reinhard Tartler <siretart at tauware.de> Sun, 22 Feb 2009 09:32:49 +0100
+ffmpeg-debian (3:0.svn20090204-2ubuntu1) jaunty; urgency=low
+
+ * merge from debian. Remaining changes:
+ - don't build depend on libfaad-dev
+
+ -- Reinhard Tartler <siretart at tauware.de> Thu, 05 Feb 2009 21:22:01 +0100
+
ffmpeg-debian (3:0.svn20090204-2) experimental; urgency=low
* add libxvmc-dev to build-depends in the 'ffmpeg' variant
@@@ -461,13 -343,6 +516,13 @@@ ffmpeg-debian (3:0.svn20090204-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 01 Feb 2009 19:54:27 +0100
+ffmpeg-debian (3:0.svn20090119-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian. LP: #318501
+ * new version fixes CVE-2008-3230, LP: #253767
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 20 Jan 2009 09:20:53 +0100
+
ffmpeg-debian (3:0.svn20090119-1) experimental; urgency=low
* New Upstream Version (svn revision 16681 libswscale revision 28341)
@@@ -498,16 -373,6 +553,16 @@@ ffmpeg-debian (3:0.svn20090110-1) exper
-- Reinhard Tartler <siretart at tauware.de> Sun, 11 Jan 2009 20:55:48 +0100
+ffmpeg-debian (3:0.svn20081115-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+
+ -- Reinhard Tartler <siretart at tauware.de> Sat, 15 Nov 2008 19:44:29 +0100
+
ffmpeg-debian (3:0.svn20081115-1) experimental; urgency=low
* new upstream svn snapshot (svn revision 15824, libswscale revision 27910)
@@@ -517,31 -382,6 +572,31 @@@
-- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 21:37:16 +0100
+ffmpeg-debian (3:0.svn20081108-1ubuntu3) jaunty; urgency=low
+
+ * really disable faad support completely.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:58:01 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu2) jaunty; urgency=low
+
+ * drop the patch to dlopen faad at runtime for now. it needs more
+ polishing, and we can have that functionality easier with the 'ffmpeg'
+ source package that will appear in multiverse.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 10:31:47 +0100
+
+ffmpeg-debian (3:0.svn20081108-1ubuntu1) jaunty; urgency=low
+
+ * merge from debian.
+ * keep myself in the maintainer field. If you are touching this or the
+ 'ffmpeg' package in multiverse, please get in touch with me. Both
+ source packages come from the same packaging branch.
+ * drop dependency on faad.
+ * import patches from old packaging to dlopen libfaad at runtime.
+
+ -- Reinhard Tartler <siretart at tauware.de> Mon, 10 Nov 2008 07:31:16 +0100
+
ffmpeg-debian (3:0.svn20081108-1) experimental; urgency=low
* upstream svn snapshot (svn revision 15786, libswscale revision 27900).
diff --combined debian/confflags
index e5d745e,a79bd13..1fe25de
--- a/debian/confflags
+++ b/debian/confflags
@@@ -1,8 -1,8 +1,8 @@@
# -*- mode: makefile -*-
# vim:syntax=make
- #
+
# build a static version on every architecture in the 'debian' ffmpeg package
- FLAVORS += static
+ FLAVORS := static
# shared is generic, i.e. without arch specific opcodes
FLAVORS += shared
@@@ -71,11 -71,18 +71,6 @@@ gpl_confflags += --enable-x11gra
# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
gpl_confflags += $(call cond_enable,/usr/include/faad.h,libfaad)
- # don't disable encoders if internalencoders is set in DEB_BUILD_OPTIONS
- ifeq (,$(filter internalencoders,$(DEB_BUILD_OPTIONS)))
- confflags += $(disable_encoders)
- endif
-
-# "forbidden" encoders, see README.Debian for details
-disable_encoders += --disable-encoder=h263
-disable_encoders += --disable-encoder=h263p
-disable_encoders += --disable-encoder=mpeg2video
-disable_encoders += --disable-encoder=mpeg4
-disable_encoders += --disable-encoder=msmpeg4v1
-disable_encoders += --disable-encoder=msmpeg4v2
-disable_encoders += --disable-encoder=msmpeg4v3
-
-# Comment out the following line to *not* disable the above encoders
-confflags += $(disable_encoders)
-
# Common configuration flags
confflags += --extra-version='$(DEB_VERSION)'
confflags += --prefix=/usr
@@@ -83,7 -90,9 +78,7 @@@ 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
@@@ -120,9 -129,6 +115,6 @@@ ifneq (,$(findstring linux,$(DEB_HOST_G
lib1394-dev += libraw1394-dev, libdc1394-22-dev
endif
- # We add vdpau headers ourselves so ffmpeg can stay in main
- confflags += --extra-cflags="-I$(CURDIR)/debian/include"
-
# XXX this probably needs fixing
CFLAGS :=
@@@ -181,7 -187,6 +173,6 @@@ altivec_build_confflags += --shlibdir=/
altivec_build_confflags += --cpu='g4'
altivec_build_confflags += --enable-shared
altivec_build_confflags += --disable-static
- altivec_build_confflags += --extra-cflags="-fPIC -DPIC"
altivec_build_confflags += --enable-altivec
altivec_build_confflags += --disable-ffmpeg
altivec_build_confflags += --disable-ffplay
diff --combined debian/control
index 77b0a5a,ca87105..ebed89b
--- a/debian/control
+++ b/debian/control
@@@ -1,26 -1,28 +1,26 @@@
Source: ffmpeg
Section: libs
Priority: optional
-Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
+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 at debian-unofficial.org>,
+ Fabian Greffrath <fabian+debian at greffrath.com>,
Andres Mejia <mcitadel at gmail.com>
DM-Upload-Allowed: yes
- Standards-Version: 3.8.2
- Vcs-Git: git://git.debian.org/git/pkg-multimedia/ffmpeg-debian.git
- Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/ffmpeg-debian.git;a=summary
+ Standards-Version: 3.8.3
+ 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],
libbz2-dev,
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
- libopenjpeg-dev,
libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libschroedinger-dev,
libsdl1.2-dev,
@@@ -29,10 -31,11 +29,11 @@@
libvorbis-dev,
libx11-dev,
libxext-dev,
+ libvdpau-dev,
libxvmc-dev,
quilt,
texi2html,
- yasm,
+ yasm [i386 amd64],
zlib1g-dev
Package: ffmpeg
@@@ -56,7 -59,8 +57,8 @@@ Depends: libavutil49 (= ${binary:Versio
libpostproc51 (= ${binary:Version}),
libavformat52 (= ${binary:Version}),
libswscale0 (= ${binary:Version}),
- ffmpeg (= ${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.
.
@@@ -148,7 -152,8 +150,8 @@@ Package: libavutil-de
Section: libdevel
Architecture: any
Depends: libavutil49 (>= ${binary:Version}) | libavutil-extra-49 (>= ${source:Upstream-Version}),
- libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-extra-49 (<= ${source:Upstream-Version}-99)
+ libavutil49 (<= ${source:Upstream-Version}-99) | libavutil-extra-49 (<= ${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.
@@@ -161,7 -166,8 +164,8 @@@ Section: libdeve
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})
+ libavutil-dev (= ${binary:Version}),
+ ${misc:Depends}
Suggests: libfaad-dev,
libgsm1-dev,
libogg-dev,
@@@ -185,7 -191,8 +189,8 @@@ Section: libdeve
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})
+ libavformat-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: development files for libavdevice
This is the device handling library from the ffmpeg project.
.
@@@ -197,7 -204,8 +202,8 @@@ Section: libdeve
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})
+ libavcodec-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: development files for libavformat
This is the demuxer library from the ffmpeg project. It supports most
existing file formats (AVI, MPEG, OGG, Matroska, ASF...).
@@@ -210,7 -218,8 +216,8 @@@ Section: libdeve
Architecture: any
Depends: libavfilter0 (>= ${binary:Version}) | libavfilter-extra-0 (>= ${source:Upstream-Version}),
libavfilter0 (<= ${source:Upstream-Version}-99) | libavfilter-extra-0 (<= ${source:Upstream-Version}-99),
- libavcodec-dev (= ${binary:Version})
+ libavcodec-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: development files for libavfilter
This is the video filtering library from the ffmpeg project.
.
@@@ -222,7 -231,8 +229,8 @@@ Section: libdeve
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})
+ libavutil-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: development files for libpostproc
This is the video postprocessing library from the ffmpeg project.
.
@@@ -234,7 -244,8 +242,8 @@@ Section: libdeve
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})
+ libavutil-dev (= ${binary:Version}),
+ ${misc:Depends}
Description: development files for libswscale
This is the video scaling library from the ffmpeg project.
.
diff --combined debian/gbp.conf
index 6d87620,1615f89..d6bc349
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@@ -1,6 -1,6 +1,6 @@@
[DEFAULT]
upstream-branch = upstream
- debian-branch = ubuntu.lucid
-debian-branch = master
++debian-branch = ubuntu
upstream-tag = upstream/%(version)s
debian-tag = debian/%(version)s
pristine-tar = True
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list