diff -u wordpress-2.5.1/debian/control wordpress-2.5.1/debian/control --- wordpress-2.5.1/debian/control +++ wordpress-2.5.1/debian/control @@ -1,7 +1,8 @@ Source: wordpress Section: web Priority: optional -Maintainer: Andrea De Iacovo +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Andrea De Iacovo Standards-Version: 3.8.0 Build-Depends: debhelper, gettext, dpatch Homepage: http://wordpress.org diff -u wordpress-2.5.1/debian/changelog wordpress-2.5.1/debian/changelog --- wordpress-2.5.1/debian/changelog +++ wordpress-2.5.1/debian/changelog @@ -1,3 +1,17 @@ +wordpress (2.5.1-8ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, 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. + + debian/patches/010_remove_update_notice.patch: + - Removed Wordpress upgrade notify in admin dashboard. + * Drop debian/patches/008CVE2008-3747.patch as we don't support SSL + in our version we don't need it. (See LP: #269301) + + -- Stefan Ebner Thu, 02 Oct 2008 22:24:20 +0200 + wordpress (2.5.1-8) unstable; urgency=high * Added 009CVE2008-4106 patch. (Closes: #500115) @@ -24,6 +38,26 @@ -- Andrea De Iacovo Sun, 31 Aug 2008 09:02:22 +0200 +wordpress (2.5.1-5ubuntu2) intrepid; urgency=low + + * Change tinymce from 3.0.7 to 3.0.8-1 + + -- Emanuele Gentili Sat, 09 Aug 2008 04:35:43 +0200 + +wordpress (2.5.1-5ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: (LP: #237348) + + 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. + + * other changes: + + debian/patches/008_remove_update_notice.patch: (LP: #227547) + - Removed Wordpress upgrade notify in admin dashboard. + + -- Emanuele Gentili Wed, 23 Jul 2008 02:25:27 +0200 + wordpress (2.5.1-5) unstable; urgency=low * Modified rules file to have a lintian clean package. @@ -46,6 +80,16 @@ -- Andrea De Iacovo Mon, 05 May 2008 23:39:35 +0200 +wordpress (2.5.1-2ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, Ubuntu remaining changes: (LP: #226667) + - 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. + - Update maintainer field in debian/control. + + -- Emanuele Gentili Mon, 05 May 2008 00:07:26 +0200 + wordpress (2.5.1-2) unstable; urgency=low * Wordpress provides a MODIFIED tinymce (Closes: #478257) @@ -94,6 +138,17 @@ -- Lionel Elie Mamane Sat, 09 Feb 2008 09:44:24 +0100 +wordpress (2.3.3-1ubuntu1) hardy; urgency=low + + * Merge from Debian unstable (LP: #189481), 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: @@ -103,6 +158,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) @@ -115,6 +181,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 @@ -123,6 +200,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 @@ -152,6 +241,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 @@ -165,6 +266,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 @@ -176,6 +289,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 @@ -183,6 +308,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 @@ -192,6 +329,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 @@ -201,6 +357,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 @@ -211,6 +376,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 diff -u wordpress-2.5.1/debian/apache.conf wordpress-2.5.1/debian/apache.conf --- wordpress-2.5.1/debian/apache.conf +++ wordpress-2.5.1/debian/apache.conf @@ -7,18 +7,18 @@ UseCanonicalName Off - VirtualDocumentRoot /srv/www/%0 + VirtualDocumentRoot /var/www/%0 Options All #ServerAdmin admin@example.com - # Store uploads in /srv/www/wp-uploads/$0 + # Store uploads in /var/www/wp-uploads/$0 RewriteEngine On - RewriteRule ^/wp-uploads/(.*)$ /srv/www/wp-uploads/%{HTTP_HOST}/$1 + RewriteRule ^/wp-uploads/(.*)$ /var/www/wp-uploads/%{HTTP_HOST}/$1 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 The above example is checked. Here are some _alternative_ suggestions: diff -u wordpress-2.5.1/debian/setup-mysql wordpress-2.5.1/debian/setup-mysql --- wordpress-2.5.1/debian/setup-mysql +++ wordpress-2.5.1/debian/setup-mysql @@ -79,12 +79,12 @@ 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 Trying to create upload directory: $UPLOAD mkdir -p $UPLOAD -chown -R www-data:www-data /srv/www/wp-uploads +chown -R www-data:www-data /var/www/wp-uploads chmod -R 0775 $UPLOAD echo Goto http://$DOMAIN to setup Wordpress @@ -109,7 +109,7 @@ DROP DATABASE IF EXISTS $NAME; EOF rm $CONFIG_FILE -rm -rf /srv/www/$DOMAIN +rm -rf /var/www/$DOMAIN [ -d $UPLOAD ] && echo Please destroy $UPLOAD manually } @@ -146,7 +146,7 @@ fi DOMAIN=$1 -UPLOAD="/srv/www/wp-uploads/$DOMAIN" +UPLOAD="/var/www/wp-uploads/$DOMAIN" if [ $DOMAIN ] ; then ping -c 1 `echo $DOMAIN | sed 's/:[0-9]\+//'` || exit 1 diff -u wordpress-2.5.1/debian/patches/00list wordpress-2.5.1/debian/patches/00list --- wordpress-2.5.1/debian/patches/00list +++ wordpress-2.5.1/debian/patches/00list @@ -8,2 +8,3 @@ -008CVE2008-3747.patch +#008CVE2008-3747.patch 009CVE2008-4106.patch +010_remove_update_notice.patch only in patch2: unchanged: --- wordpress-2.5.1.orig/debian/patches/010_remove_update_notice.patch +++ wordpress-2.5.1/debian/patches/010_remove_update_notice.patch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 010_remove_update_notice.patch.dpatch by Emanuele Gentili +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix for remove wordpress update notify in admin dashboard. + +@DPATCH@ +diff -urNad wordpress-2.5.1-5ubuntu1~/wp-admin/includes/update.php wordpress-2.5.1-5ubuntu1/wp-admin/includes/update.php +--- wordpress-2.5.1-5ubuntu1~/wp-admin/includes/update.php 2008-07-13 19:55:36.000000000 +0200 ++++ wordpress-2.5.1-5ubuntu1/wp-admin/includes/update.php 2008-07-23 02:24:09.000000000 +0200 +@@ -34,9 +34,9 @@ + return false; + + if ( current_user_can('manage_options') ) +- $msg = sprintf( __('WordPress %2$s is available! Please update now.'), $cur->url, $cur->current ); +- else +- $msg = sprintf( __('WordPress %2$s is available! Please notify the site administrator.'), $cur->url, $cur->current ); ++// $msg = sprintf( __('WordPress %2$s is available! Please update now.'), $cur->url, $cur->current ); ++// else ++// $msg = sprintf( __('WordPress %2$s is available! Please notify the site administrator.'), $cur->url, $cur->current ); + + echo "
$msg
"; + }