~ubuntu-branches/ubuntu/wily/kid3/wily-proposed

Viewing all changes in revision 33.

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell
  • Date: 2010-05-26 17:57:40 UTC
  • mfrom: (1.1.11 upstream) (2.1.8 sid)
  • Revision ID: james.westby@ubuntu.com-20100526175740-c86815ej5196z3of
Tags: 1.4-1ubuntu1
* Merge with Debian, remaining changes:
  + debian/control:
    - Build-depend on libmp4v2-dev.
  + debian/rules:
    - Build WITH_MP4V2.
* Add kubuntu_01_fix_docs.diff to fix compile with KDE 4.5 and
  apply in debian/rules

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: