-
Committer:
Bazaar Package Importer
-
Author(s):
Fabrice Coutadeur
-
Date:
2011-07-17 17:22:33 UTC
-
mfrom:
(2.1.6 sid)
-
Revision ID:
james.westby@ubuntu.com-20110717172233-98lp0rs01nywropp
Tags: 1.3.4-1.2ubuntu1
* Merge from debian unstable, no remaining changes:
- Add Breaks on udev: upgrade path goes thru Lucid that has a higher
version. Dropped as it's not useful anymore.
- Add 30_v4l1_includes.diff: integrated in Debian
- Add missing libv4l-dev bd: integrated in Debian
- configure.in. Check for libavcodec and libavutil: integrated in Debian
* 99_fix_ftbfs_libav_0.7.patch: fix FTBFS with libav 0.7 because of
deprecated functions (LP: #749217)
* Rebuild for libquicktime 1.2.2 transition (lp: #773968)