-
Committer:
Bazaar Package Importer
-
Author(s):
Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
-
Date:
2008-12-26 00:10:06 UTC
-
mfrom:
(1.1.2 upstream)
-
Revision ID:
james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
- For ffmpeg-related build-deps, fix versionized dependencies
as the ubuntu versioning is different than debian-multimedia's.
[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
change (cherry-pick from Gentoo #234383).