lp:~matttbe/ubuntu/quantal/libav/lp1011136

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/quantal/libav

Reinhard Tartler: Approve on 2012-06-10

Ubuntu Sponsors: Pending requested 2012-06-10

Diff: 36 lines (+13/-4)

3 files modified

debian/changelog (+8/-0)
debian/ffmpeg.install (+2/-2)
debian/libav-tools.install (+3/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1011136: package ffmpeg 4:0.8.1-0ubuntu2 failed to upgrade: trying to overwrite 'ffmpeg' and 'ffmpeg.1.gz', which is also in package libav-tools 4:0.8.1-0ubuntu3

High

Fix Released

Link a bug report

Related blueprints

22. By Matthieu Baerts on 2012-06-10

* debian/ffmpeg.install and debian/libav-tools.install:
 - Moved all ffmpeg binaries and manpages to ffmpeg package
   (LP: #1011136)

21. By Reinhard Tartler on 2012-06-10

[ Andres Mejia ]
* Install manpage for qt-faststart in the correct package.

[ Reinhard Tartler ]
* bump standards version, no changes needed

[ Andres Mejia ]
* Remove dependencies and suggests of FAAD, no longer needed.
* Enable frei0r support.

[ Reinhard Tartler ]
* drop build-dep on frei0r-plugins-dev

[ Andres Mejia ]
* Enable tls support through gnutls.
* Enable libcdio support.
* Enable opencv support.

[ Reinhard Tartler ]
* drop build-dep on libcv-dev and libopencv-dev

[ Andres Mejia ]
* Enable pulse support.
* Include conditional enablers for vo-aacenc and vo-amrwbenc.
* Update comment about GPLv3 features.
* Make clear that is FAAC that's considered non-free, not AAC.
* Enable jack support for all architectures.

[ Fabian Greffrath ]
* Enable hardened build flags through dpkg-buildflags (Closes: #658929).
* Filter out system-wide setting of -Bsymbolic-functions to avoid FTBFS.
* Set CPPFLAGS separately.

[ Andres Mejia ]
* Don't override -g or -O3 flags set by libav's build system.

[ Reinhard Tartler ]
* confflags: use --enable-pic instead of manually messing with cflags

[ Andres Mejia ]
* Separate the ffmpeg program into the transitional package.
* Add NEWS entry for ffmpeg deprecation.

[ Reinhard Tartler ]
* add conflicts/replaces for ffmpeg transitional package

[ Andres Mejia ]
* Properly migrate /etc/ffserver.conf to /etc/avserver.conf. (Closes: #660786)
* Don't ignore errors in maintainer scripts.
* Fix build for hurd. Thanks to Samuel Thibault for patch.

[ Reinhard Tartler ]
* Cherry pick the mentioned changes above to the ubuntu branch

20. By Andres Mejia <email address hidden> on 2012-05-13

Update warning to make clearer the deprecation of ffmpeg binary.
(LP: #939863)

19. By Micah Gersten on 2012-03-21

* New upstream bug and security fix release (FFe: LP: #960949)
  - fixes the following CVEs:
    CVE-2012-0848, CVE-2012-0853, CVE-2012-0858, CVE-2011-3929,
    CVE-2011-3936, CVE-2011-3937, CVE-2011-3940, CVE-2011-3945,
    CVE-2011-3947, CVE-2011-3951, CVE-2011-3952

* Pull fix from Debian git to fix installation of avserver.conf and
  recordshow.sh into libav-tools; Thanks to Julien Cristau for spotting this!
  - update debian/rules

18. By Alessio Treglia on 2012-02-09

No-change rebuild to pick libvpx's new shlibs. (LP: #926580)

17. By Reinhard Tartler on 2012-01-24

* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp,
    x264, and xvid (all in universe)

16. By Reinhard Tartler on 2012-01-21

* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp,
    x264, and xvid (all in universe)

15. By Reinhard Tartler on 2012-01-12

* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp,
    x264, and xvid (all in universe)

14. By Reinhard Tartler on 2011-12-26

* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp,
    x264, and xvid (all in universe)
* Install libraries in multi-arch directories.

13. By Reinhard Tartler on 2011-10-01

* Merge from debian, remaining changes:
  - don't build against libfaad, libdirac, librtmp and libopenjpeg,
    lame, xvid, x264 (all in universe)
  - not installing into multiarch directories
* This new upstream release has basically merged in all 70 patches that
  are present in 4:0.7.1-7ubuntu2, plus some additional, similarily
  focused ones.