diff -u wordpress-2.3.3/debian/control wordpress-2.3.3/debian/control --- wordpress-2.3.3/debian/control +++ wordpress-2.3.3/debian/control @@ -1,7 +1,8 @@ Source: wordpress Section: web Priority: optional -Maintainer: Kai Hendry +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Kai Hendry Uploaders: Lionel Elie Mamane Standards-Version: 3.7.3 Build-Depends: debhelper (>> 4), gettext diff -u wordpress-2.3.3/debian/changelog wordpress-2.3.3/debian/changelog --- wordpress-2.3.3/debian/changelog +++ wordpress-2.3.3/debian/changelog @@ -1,3 +1,14 @@ +wordpress (2.3.3-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #187465), Ubuntu remaining changes: + - 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. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Emanuele Gentili Wed, 06 Feb 2008 06:14:36 +0100 + wordpress (2.3.3-1) unstable; urgency=high * New upstream security release @@ -7,6 +18,17 @@ -- Kai Hendry Tue, 05 Feb 2008 16:22:57 +0000 +wordpress (2.3.2+fr-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #187465), Ubuntu remaining changes: + - 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. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Tue, 22 Jan 2008 09:45:59 +0000 + wordpress (2.3.2+fr-1) unstable; urgency=low * Add French language support (Closes: #461617) @@ -19,6 +41,17 @@ -- Lionel Elie Mamane Mon, 21 Jan 2008 23:08:32 +0100 +wordpress (2.3.2-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #180922), Ubuntu remaining changes: + - 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. + * Modify Maintainer value to match Debian-Maintainer-Field Spec + + -- Pedro Fragoso Sun, 06 Jan 2008 21:38:43 +0000 + wordpress (2.3.2-1) unstable; urgency=high * New upstream security release @@ -27,6 +60,18 @@ -- Kai Hendry Sun, 06 Jan 2008 18:12:21 +0000 +wordpress (2.3.1-1ubuntu1) hardy; urgency=low + + * New upstream release. (LP: #138819) + * Merge from debian unstable, remaining changes: + - 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. + - Update maintainer field in debian/control. + + -- William Grant Wed, 14 Nov 2007 08:50:22 +1100 + wordpress (2.3.1-1) unstable; urgency=high * New upstream security release @@ -56,6 +101,18 @@ -- Kai Hendry Mon, 10 Sep 2007 19:36:34 +0100 +wordpress (2.2.2-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian. + - 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. + - Update maintainer field in debian/control. + + -- Michele Angrisano Mon, 06 Aug 2007 01:29:18 +0200 + wordpress (2.2.2-1) unstable; urgency=high * New upstream security release @@ -69,6 +126,18 @@ -- Kai Hendry Sun, 05 Aug 2007 09:59:15 +0100 +wordpress (2.2.1-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable, remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian. + - 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. + - Update maintainer in field debian/control. + + -- Michele Angrisano Mon, 2 Jul 2007 12:38:17 +0200 + wordpress (2.2.1-1) unstable; urgency=high * New upstream release @@ -80,6 +149,18 @@ -- Kai Hendry Sat, 23 Jun 2007 12:47:10 +0100 +wordpress (2.2-1ubuntu1) gutsy; urgency=low + + * Merge from Debian unstable. Remaining Ubuntu changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + - 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 + + -- Kjell Braden Fri, 25 May 2007 15:47:58 +0200 + wordpress (2.2-1) unstable; urgency=low * New upstream release @@ -87,6 +168,18 @@ -- Kai Hendry Wed, 16 May 2007 09:54:36 +0100 +wordpress (2.1.3-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + - 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 + * UVF exception: LP: #103396 + + -- Michael Bienia Thu, 5 Apr 2007 22:39:12 +0200 + wordpress (2.1.3-1) unstable; urgency=high * New upstream security release @@ -96,6 +189,25 @@ -- Kai Hendry Wed, 04 Apr 2007 20:35:40 +0100 +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: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + - debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * Fixes CVE-2007-1230 + * UVF exception: LP: #90532 + + -- Michael Bienia Thu, 8 Mar 2007 12:26:41 +0100 + wordpress (2.1.2-1) unstable; urgency=high * New upstream security release @@ -105,6 +217,15 @@ -- Kai Hendry Sun, 4 Mar 2007 20:53:12 +0000 +wordpress (2.1.1-1ubuntu1) feisty; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + * debian/control: Change Maintainer/XSBC-Original-Maintainer field. + * UVF exception: LP: #87097 + + -- Michael Bienia Fri, 23 Feb 2007 14:10:37 +0100 + wordpress (2.1.1-1) unstable; urgency=high * New upstream security release @@ -115,6 +236,12 @@ -- Kai Hendry Wed, 21 Feb 2007 11:14:33 +0000 +wordpress (2.1.0-1ubuntu1) feisty; urgency=low + + * Changed Blogroll to point to Planet Ubuntu instead of Planet Debian + + -- Martin Meredith Mon, 5 Feb 2007 15:05:21 +0000 + wordpress (2.1.0-1) unstable; urgency=low * New upstream release @@ -361,0 +489 @@ + diff -u wordpress-2.3.3/debian/README.debian wordpress-2.3.3/debian/README.debian --- wordpress-2.3.3/debian/README.debian +++ wordpress-2.3.3/debian/README.debian @@ -30,6 +30,14 @@ Or better by utilising symbolic links. e.g. ln -s /home/user/mytheme /usr/share/wordpress/wp-content/themes/mytheme +#### 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 + #### Switching a blog to a new language - in the admin pages, select a theme in the desired language; @@ -52,0 +61 @@ + diff -u wordpress-2.3.3/debian/setup-mysql wordpress-2.3.3/debian/setup-mysql --- wordpress-2.3.3/debian/setup-mysql +++ wordpress-2.3.3/debian/setup-mysql @@ -70,8 +70,8 @@ IDENTIFIED BY '$DB_PASSWORD'; FLUSH PRIVILEGES; EOF -[ -d /srv/www ] || mkdir -p /srv/www -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 } @@ -94,7 +94,7 @@ DROP DATABASE IF EXISTS $NAME; EOF rm $CONFIG_FILE -rm /srv/www/$DOMAIN +rm /var/www/$DOMAIN } prompt() { diff -u wordpress-2.3.3/debian/apache.conf wordpress-2.3.3/debian/apache.conf --- wordpress-2.3.3/debian/apache.conf +++ wordpress-2.3.3/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. only in patch2: unchanged: --- wordpress-2.3.3.orig/wp-admin/upgrade-functions.php +++ wordpress-2.3.3/wp-admin/upgrade-functions.php @@ -1,4 +1,4 @@ \ No newline at end of file +?>