[SCM] FFmpeg packaging branch, ubuntu.jaunty, updated. debian/0.svn20090303-1-12-g605983f
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Fri Mar 13 08:08:47 UTC 2009
The following commit has been merged in the ubuntu.jaunty branch:
commit d4f0bccc5ab8037b6fa9763cfacf6f285254ac9f
Merge: 15e8beab9fc08533b040bb9eac0afd9abefcf56e 3d2ab017eb235bd9ed9d9ec3ab895ef751ab1557
Author: Reinhard Tartler <siretart at tauware.de>
Date: Fri Mar 13 08:53:09 2009 +0100
merge from debian/unstable
diff --combined debian/changelog
index 25a1c7c,fc3f67b..2f097d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,41 +1,48 @@@
+ ffmpeg-debian (3:0.svn20090303-1) unstable; urgency=low
+
+ * New Upstream Version (svn revision 17737 libswscale revision 28799)
+ - Electronic Arts TQI decoder
+ - OpenJPEG based JPEG 2000 decoder
+ - NC (NC4600) camera file demuxer
+ - Gopher client support
+ - MXF D-10 muxer
+ - generic metadata API
+ * debian/get-orig-source.sh: Track the version 0.5 release branch. The
+ version number does not really reflect this, but this package is
+ actually very close to the 0.5 release branch.
+ * various cleanups to improve get-orig-source.sh
+ * Remove liba52 from the suggests field in debian/control.ffmpeg, as
+ ffmpeg does no longer use it since upload 0.svn20080206-10.
+ * Fix the Vcs-Git urls to the correct locations.
+ * The libavformat52 now links against libavcodec52, which breaks
+ applications that *ALSO* link against libavcodec51. Adding a
+ Breaks: libavcodec51 should prevent this and (hopefully) Closes: #516885.
+ * improve parallel builds on SMP/multicores by supporting the parallel
+ flag in DEB_BUILD_OPTIONS, and default to the number of available CPUs
+ on i386 and amd64.
+ * Drop unapplied patches from debian/patches.
+ * bump shlibs version.
+
+ -- Reinhard Tartler <siretart at tauware.de> Tue, 03 Mar 2009 21:01:25 +0100
+
+ ffmpeg-debian (3:0.svn20090204-3) unstable; urgency=low
+
+ [ Fabian Greffrath ]
+ * remove libasound2-dev from build-depends on non-Linux archs
+
+ [ Reinhard Tartler ]
+ * fix postinst generation by calling dh_installdeb after dh_makeshlibs
+ * upload to unstable
+
+ -- 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
@@@ -55,13 -86,6 +93,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)
@@@ -92,16 -116,6 +130,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)
@@@ -111,31 -125,6 +149,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/control
index 3af1d68,7cf5a05..50d16c9
--- a/debian/control
+++ b/debian/control
@@@ -7,13 -7,14 +7,13 @@@ Uploaders: Sam Hocevar (Debian packages
Reinhard Tartler <siretart at tauware.de>,
Fabian Greffrath <fabian at debian-unofficial.org>
Standards-Version: 3.8.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.mplayerhq.hu/
+ 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
+ Homepage: http://ffmpeg.org/
Build-Depends-Indep: doxygen
Build-Depends: debhelper (>= 5.0.0),
- libasound2-dev,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
@@@ -105,6 -106,7 +105,7 @@@ Section: lib
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+ 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...).
diff --combined debian/control.ffmpeg
index 740b128,b68b1e6..f95e795
--- a/debian/control.ffmpeg
+++ b/debian/control.ffmpeg
@@@ -1,5 -1,5 +1,5 @@@
Build-Depends: debhelper (>= 5.0.0),
- libasound2-dev,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libfaad-dev | libfaad2-dev,
libfreetype6-dev,
@@@ -13,14 -13,9 +13,14 @@@
libvorbis-dev,
libx11-dev,
libxext-dev,
- libxvmc-dev,
+ libmp3lame-dev,
+ libfaac-dev,
+ libxvidcore-dev | libxvidcore4-dev,
quilt,
texi2html,
+ libx264-dev (>> 1:0.svn20081230),
+ libxvmc-dev [i386 amd64],
+ nvidia-180-libvdpau-dev [i386 amd64],
zlib1g-dev
Package: libavutil-unstripped-49
@@@ -42,7 -37,7 +42,7 @@@ Section: lib
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
- Suggests: liba52-0.7.4, libfaad0
+ Suggests: libfaad0
Conflicts: libavcodec52
Replaces: libavcodec52
Description: ffmpeg codec library
@@@ -96,6 -91,7 +96,7 @@@ Depends: ${shlibs:Depends}
${misc:Depends}
Conflicts: libavformatcvs52, libavformat52
Replaces: libavformatcvs52, 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...).
diff --combined debian/control.ffmpeg-debian
index 7b29ad9,1000358..4028b85
--- a/debian/control.ffmpeg-debian
+++ b/debian/control.ffmpeg-debian
@@@ -1,6 -1,7 +1,6 @@@
Build-Depends: debhelper (>= 5.0.0),
- libasound2-dev,
+ libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
- libfaad-dev | libfaad2-dev,
libfreetype6-dev,
libgsm1-dev,
libimlib2-dev,
@@@ -92,6 -93,7 +92,7 @@@ Section: lib
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends}
+ 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...).
--
FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list