~ubuntu-branches/ubuntu/maverick/ffmpeg-debian/maverick

Viewing all changes in revision 2.

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2008-07-11 13:05:47 UTC
  • Revision ID: james.westby@ubuntu.com-20080711130547-ohdcf801tolxltdq
Tags: 3:0.svn20080206-10ubuntu1
* Resyncronize with debian. Remaining changes:
  - add epoch needed for ubuntu.
  - debian/control: drop build dependencies on libfaad,
    both not in ubuntu/main.
  - debian/control: adjust dependency for coping with annoying epoch.
  - Set myself in the maintainer field.
* add epochs for conflicts/replaces entries in debian/control as well.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: