~ubuntu-branches/ubuntu/hardy/mysql-dfsg-5.0/hardy-updates

Viewing all changes in revision 34.

  • Committer: Bazaar Package Importer
  • Author(s): Mathias Gug
  • Date: 2008-03-03 19:43:09 UTC
  • Revision ID: james.westby@ubuntu.com-20080303194309-mg0qqux53gb2du5u
Tags: 5.0.51a-3ubuntu1
* 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.
    - Replaces and Conflicts apparmor-profiles << 2.1+1075-0ubuntu4 to allow
      proper upgrade from gutsy.
  - 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.
  - debian/apparmor-profile, debian/mysql-server-5.0.files: add AppArmor
    profile.
  - debian/mysql-server-5.0.postinst: Reload AA profile on configuration.
  - debian/mysql-server-5.0.README.Debian: add a note on AppArmor.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: