Merge lp:~smartboyhw/wubi/bug-1070682 into lp:wubi

[Howard Chan]

Added Ubuntu Studio into Wubi

[Colin Watson (cjwatson)]

On Thu, Nov 15, 2012 at 12:04:21PM -0000, Howard Chan wrote:
> +website=http://www.edubuntu.org

I doubt this is right - could you match that up with the previous
paragraph, please?

[lp:~smartboyhw/wubi/bug-1070682]

275. By Howard Chan on 2012-11-15

Typo on website

276. By Howard Chan on 2012-11-16

Changed name in .disk/info

Unmerged revisions

=== added file 'data/images/Ubuntu-Studio-header.bmp'
Binary files data/images/Ubuntu-Studio-header.bmp	1970-01-01 00:00:00 +0000 and data/images/Ubuntu-Studio-header.bmp	2012-11-15 12:21:20 +0000 differ
=== added file 'data/images/Ubuntu-Studio-vertical.bmp'
Binary files data/images/Ubuntu-Studio-vertical.bmp	1970-01-01 00:00:00 +0000 and data/images/Ubuntu-Studio-vertical.bmp	2012-11-15 12:21:20 +0000 differ
=== added file 'data/images/Ubuntu-Studio.ico'
Binary files data/images/Ubuntu-Studio.ico	1970-01-01 00:00:00 +0000 and data/images/Ubuntu-Studio.ico	2012-11-15 12:21:20 +0000 differ
=== modified file 'data/isolist.ini'
--- data/isolist.ini	2012-09-28 11:50:01 +0000
+++ data/isolist.ini	2012-11-15 12:21:20 +0000
@@ -119,3 +119,30 @@
 metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/quantal-desktop-amd64.metalink
 website=http://lubuntu.net
 ordering=7
+
+[Ubuntu-Studio-i386]
+min_iso_size=1500000000
+max_iso_size=3500000000
+min_disk_space_mb=10000
+min_memory_mb=512
+arch=i386
+name=Ubuntu Studio
+packages=ubuntustudio-desktop
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/12.10/release/ubuntustudio-12.10-dvd-i386.metalink
+metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/quantal-dvd-i386.metalink
+website=http://ubuntustudio.org
+ordering=8
+
+[Ubuntu-Studio-amd64]
+min_iso_size=1500000000
+max_iso_size=3500000000
+min_disk_space_mb=10000
+min_memory_mb=512
+arch=amd64
+name=Ubuntu Studio
+packages=ubuntustudio-desktop
+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/12.10/release/ubuntustudio-12.10-dvd-amd64.metalink
+metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/quantal-dvd-amd64.metalink
+website=http://ubuntustudio.org
+ordering=8
+

=== modified file 'debian/changelog'
--- debian/changelog	2012-10-08 14:22:46 +0000
+++ debian/changelog	2012-11-15 12:21:20 +0000
@@ -10,7 +10,10 @@
     cdimage.ubuntu.com in 12.04.
   * Add support for Tibetan.
 
- -- Evan Dandrea <[e-mail]>  Wed, 06 Jun 2012 14:54:06 +0100
+  [ Howard Chan ]
+  * Added Ubuntu Studio option into Wubi (LP: #1070682)
+
+ -- Howard Chan <[e-mail]>  Thu, 15 Nov 2012 19:48:09 +0800
 
 wubi (12.04) precise; urgency=low