-
Committer:
Bazaar Package Importer
-
Author(s):
Mathias Gug
-
Date:
2009-02-10 16:42:05 UTC
-
mfrom:
(1.1.1 upstream)
-
Revision ID:
james.westby@ubuntu.com-20090210164205-ej41ocvm4z1s14nq
Tags: 5.1.31-1ubuntu1
* Merge from debian experimental, remaining changes:
- debian/mysql-server-5.1.config: ask for MySQL root password at priority
high instead of medium so that the password prompt is seen on a default
install. (LP: #319843)
- debian/control:
+ Don't build mysql-server, mysql-client, mysql-common and
libmysqlclient15-dev binary packages since they're still provided
by mysql-dfsg-5.0.
+ Rename libmysqlclient-dev package to libmysqlclient16-dev (LP: #316280).
Make it conflict with libmysqlclient15-dev.
+ Make mysql-{client,server}-5.1 packages conflict and
replace mysql-{client,server}-5.0, but not provide
mysql-{client,server}.
+ Depend on a specific version of mysql-common rather than the src
version of mysql-dfsg-5.1 since mysql-common is currently part of
mysql-dfsg-5.0.
- debian/rules: added -fno-strict-aliasing to CFLAGS to get
around mysql testsuite build failures.
* debian/patches/92_ssl_test_cert.dpatch: certificate expiration in
test suite (LP: #323755).
* Dropped changes:
- all of the changes made to support both 5.0 and 5.1 installed at the
same time have been dropped now that amarok doesn't depend on
mysql-server-5.1 anymore.