~ubuntu-branches/ubuntu/karmic/tangerine/karmic

Viewing all changes in revision 6.

  • Committer: Bazaar Package Importer
  • Author(s): Alessio Treglia
  • Date: 2009-08-11 12:09:13 UTC
  • Revision ID: james.westby@ubuntu.com-20090811120913-oo56z2y7ndd2cvbc
Tags: 0.3.0+dfsg-5ubuntu1
* Merge from debian unstable, Ubuntu remaining changes:
  - debian/control: Remove amarok from Suggests field.
  - debian/patches/06_no_amarok.patch: Don't build the amarok plugin, it
    doesn't work with Amarok 2.
* Add 07_fix_desktop_file.patch patch to remove deprecated Encoding key;
  reported to Debian (Debian bug #541033).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: