← Back to branch summary

~ubuntu-branches/ubuntu/vivid/akonadi/vivid-proposed

Viewing all changes in revision 102.

  • Committer: Package Import Robot
  • Author(s): Scarlett Clark
  • Date: 2014-10-31 14:50:27 UTC
  • mfrom: (3.1.22 sid)
  • Revision ID: package-import@ubuntu.com-20141031145027-su525d2kmotl3qyz
Tags: 1.13.0-2ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - Add a mysqld-akonadi wrapper script.
  - Add apparmor profile for mysqld-akonadi (usr.sbin.mysqld-akonadi).
  - Make akonadi-backend-mysql depend on mysql-server-core-5.5 and
    mysql-client-core-5.5 or *5.6 instead of mysql-server-core.
  - Force dependency on akonadi-backend-mysql for akonadi-server.
  - Keep debian/libakonadiprotocolinternals1.symbols from Ubuntu
  - Add Kubuntu to the maintainers as we are moving to debian git.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: