Viewing all changes in revision 74.
- Committer: Package Import Robot
- Date: 2012-05-24 19:27:56 UTC
- mfrom: (3.1.12 sid)
- Revision ID: package-import@ubuntu.com-20120524192756-yhdijq0ny2jy912h
* Merge with Debian, 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 instead of mysql-server-core.
- Force dependency on akonadi-backend-mysql for akonadi-server.
- 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 instead of mysql-server-core.
- Force dependency on akonadi-backend-mysql for akonadi-server.
- files added:
- .pc
- .pc/disable_dbus_requiring_tests.diff
- .pc/disable_dbus_requiring_tests.diff/server
- .pc/disable_dbus_requiring_tests.diff/server/tests
- .pc/disable_dbus_requiring_tests.diff/server/tests/unittest
- debian/patches
- files modified:
- debian/KUBUNTU-DEBIAN-DIFFERENCES
expand all
collapse all
added
removed
