~ubuntu-branches/ubuntu/maverick/wordpress/maverick-proposed

Viewing all changes in revision 38.

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Wenning
  • Date: 2010-04-16 09:38:21 UTC
  • mfrom: (1.2.8 upstream) (11.1.15 sid)
  • Revision ID: james.westby@ubuntu.com-20100416093821-0knh06dtlvs6nwp8
Tags: 2.9.2-1ubuntu1
* Merge from debian testing. (LP: #564393) Remaining changes:
  - debian/apache.conf:
    + Changed to use /var/www instead of /srv/www for virtual webroot.
  - debian/setup-mysql:
    + Changed to use /var/www instead of /srv/www.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: