~ubuntu-branches/ubuntu/jaunty/libmtp/jaunty

Viewing all changes in revision 7.

  • Committer: Bazaar Package Importer
  • Author(s): Steve Kowalik
  • Date: 2007-05-30 10:14:07 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20070530101407-g5xaslwqm5ad0xl8
Tags: 0.1.5-2ubuntu1
* Manually merge from Debian unstable.
* Remaining Ubuntu changes:
  - Conflict against libmtp2.
  - Don't use a bashism in debian/rules to rename manual pages.
* Munge Maintainer field as per spec.
* Remove hotplug from the Depends of libmtp5.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: