-
Committer:
Bazaar Package Importer
-
Author(s):
Mathias Gug, Mathias Gug, Jamie Strandboge
-
Date:
2008-02-14 13:47:59 UTC
-
mfrom:
(1.1.15 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080214134759-vhjuxbcozeqyub0q
Tags: 5.0.51a-1ubuntu1
[ Mathias Gug ]
* Merge from debian unstable, remaining changes:
- debian/control:
- Set Maintainer to Ubuntu Core dev. Move Debian maintainer
to XSBC-Original-Maintainer.
- Add mysql-doc-5.0 as a Suggests to mysql-client-5.0, mysql-server-5.0
and libmysqlclient15-dev.
- Preprend XS-Original- to Vcs-{Browser,Svn}.
- Fix man page conflicts with mysql-doc-5.0 when upgrading from gutsy
for mysql-server-5.0, mysql-client-5.0 and libmysqlclient15-dev
packages.
- debian/rules:
- Apply same configuration options on lpia as for i386.
- Replace --with-comment="Debian" with --with-comment="Ubuntu".
- debian/additions/my.cnf:
Add note about the "/etc/mysql/conf.d" directory in my.cnf.
- debian/patches/56-mysqlhotcopy-invalid-dbtable.dpatch:
Fixed mysqlhotcopy failure.
- debian/patches/57-fix-mysqlslowdump-config.dpatch:
Fixed mysqlslowdump usage.
* Dropped:
- debian/rules:
- Support DEB_BUILD_OPTIONS option 'nocheck' to skip tests.
* debian/control:
- Add build dependency on texlive-extra-utils.
[ Jamie Strandboge ]
* add AppArmor profile
+ debian/apparmor-profile
+ debian/mysql-server-5.0.postinst: Reload AA profile on configuration
* updated debian//mysql-server-5.0.README.Debian for note on AppArmor
* debian/control: Replaces apparmor-profiles << 2.1+1075-0ubuntu4 as we
should now take control
* debian/control: Conflicts with apparmor-profiles << 2.1+1075-0ubuntu4
to make sure that if earlier version of apparmor-profiles gets installed
it won't overwrite our profile