diff -u wordpress-2.1.2/debian/changelog wordpress-2.1.2/debian/changelog --- wordpress-2.1.2/debian/changelog +++ wordpress-2.1.2/debian/changelog @@ -1,3 +1,12 @@ +wordpress (2.1.2-1ubuntu2) feisty; urgency=low + + * Closes LP: #53001 + - debian/apache.conf: Changed to use /var/www instead of /srv/www for virtual webroot + - debian/README.debian: Updated to include documentation on the change + - debian/setup-mysql: Changed to use /var/www instead of /srv/www + + -- Joseph Jackson IV Sun, 25 Mar 2007 03:16:00 +0500 + wordpress (2.1.2-1ubuntu1) feisty; urgency=low * Merge from Debian unstable. Remaining changes: diff -u wordpress-2.1.2/debian/setup-mysql wordpress-2.1.2/debian/setup-mysql --- wordpress-2.1.2/debian/setup-mysql +++ wordpress-2.1.2/debian/setup-mysql @@ -71,7 +71,8 @@ IDENTIFIED BY '$DB_PASSWORD'; FLUSH PRIVILEGES; EOF -ln -s /usr/share/wordpress /srv/www/$DOMAIN +[ -d /var/www ] || mkdir -p /var/www +ln -s /usr/share/wordpress /var/www/$DOMAIN echo Goto http://$DOMAIN to setup Wordpress } diff -u wordpress-2.1.2/debian/apache.conf wordpress-2.1.2/debian/apache.conf --- wordpress-2.1.2/debian/apache.conf +++ wordpress-2.1.2/debian/apache.conf @@ -6,12 +6,12 @@ UseCanonicalName Off -VirtualDocumentRoot /srv/www/%0 +VirtualDocumentRoot /var/www/%0 Options All #And then link the blog to your preferred domain, e.g.: -#ln -s /usr/share/wordpress /srv/www/blog.example.com +#ln -s /usr/share/wordpress /var/www/blog.example.com #Of course make sure that the domain name 'blog.example.com' resolves to your #local machine. diff -u wordpress-2.1.2/debian/README.debian wordpress-2.1.2/debian/README.debian --- wordpress-2.1.2/debian/README.debian +++ wordpress-2.1.2/debian/README.debian @@ -31,0 +32,9 @@ + +#### Filesystem Hierarchy Standard Compatibility + +In order to work around the Wordpress package's use of the Filesystem Hierarchy Standard of /srv/www and not the +Debian/Ubuntu's apache usage of /var/www/ for serving web documents the following parts of this package have been +modified: + - the included apache configuration file + - the included `setup-mysql` script +