[Bug 327674] Re: Please merge wordpress 2.7.1-2ubuntu1 (universe) from Debian unstable (main)

[Pedro Fragoso]

--- interdiff   2009-02-17 01:40:23.000000000 +0000
+++ jaunty-debdiff  2009-02-18 09:43:09.000000000 +0000
@@ -4,15 +4,15 @@
 @@ -1,3 +1,15 @@
 +wordpress (2.7.1-2ubuntu1) jaunty; urgency=low
 +
-+  * Merge from Debian unstable (LP: #327674), Ubuntu remaining changes:
++  * Merge from debian unstable, remaining changes: (LP: #327674)
 +    - 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:
-+      + Remove Wordpress upgrade notify in admin dashboard
++      + Patch to remove Wordpress upgrade notify in admin dashboard
 +
-+ -- Pedro Fragoso <ember at ubuntu.com>  Tue, 17 Feb 2009 01:15:21 +0000
++ -- Stefan Lesicnik <stefan at lsd.co.za>  Wed, 18 Feb 2009 11:39:27 +0200
 +
  wordpress (2.7.1-2) unstable; urgency=low

@@ -442,12 +442,8 @@
 diff -u wordpress-2.7.1/debian/patches/00list wordpress-2.7.1/debian/patches/00list
 --- wordpress-2.7.1/debian/patches/00list
 +++ wordpress-2.7.1/debian/patches/00list
-@@ -5,4 +5,5 @@
- 005french.patch
- 006rss_language.patch
+@@ -8,0 +9 @@
 +010_remove_update_notice.patch
- 007_REQUEST.patch
- 008CVE2008-2392.patch
 only in patch2:
 unchanged:
 --- wordpress-2.7.1.orig/debian/patches/010_remove_update_notice.patch

-- 
Please merge wordpress 2.7.1-2ubuntu1 (universe) from Debian unstable (main)
https://bugs.launchpad.net/bugs/327674
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.

-- 
ubuntu-bugs mailing list
ubuntu-bugs at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs