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

Proposed by Howard Chan on 2012-11-15
Status: Merged
Approved by: Colin Watson on 2012-11-16
Approved revision: 276
Merged at revision: 274
Proposed branch: lp:~smartboyhw/wubi/bug-1070682
Merge into: lp:wubi
Diff against target: 55 lines (+31/-1)
2 files modified
data/isolist.ini (+27/-0)
debian/changelog (+4/-1)
To merge this branch: bzr merge lp:~smartboyhw/wubi/bug-1070682
Reviewer Review Type Date Requested Status
Colin Watson 2012-11-15 Approve on 2012-11-16
Review via email: mp+134453@code.launchpad.net

This proposal supersedes a proposal from 2012-11-15.

Commit message

Added Ubuntu-Studio option into Wubi (LP: #1070682)

Description of the change

[Background]

In Launchpad Bug #1070682 and in two questions there has been a wish that Ubuntu Studio should be in Wubi. The Ubuntu Studio team agrees to let it be possible.

[Code]

The code is involved with changes in isolist.ini.

[Review]
Please review it.

To post a comment you must log in.
Colin Watson (cjwatson) wrote : Posted in a previous version of this proposal

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 updated on 2012-11-16
276. By Howard Chan on 2012-11-16

Changed name in .disk/info

Howard Chan (smartboyhw) wrote :

Yes revision 276 is a fix that .data/isolist.ini doesn't equal to Ubuntu-Studio .disk/info.

Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'data/images/Ubuntu-Studio-header.bmp'
2Binary files data/images/Ubuntu-Studio-header.bmp 1970-01-01 00:00:00 +0000 and data/images/Ubuntu-Studio-header.bmp 2012-11-16 07:05:21 +0000 differ
3=== added file 'data/images/Ubuntu-Studio-vertical.bmp'
4Binary files data/images/Ubuntu-Studio-vertical.bmp 1970-01-01 00:00:00 +0000 and data/images/Ubuntu-Studio-vertical.bmp 2012-11-16 07:05:21 +0000 differ
5=== added file 'data/images/Ubuntu-Studio.ico'
6Binary files data/images/Ubuntu-Studio.ico 1970-01-01 00:00:00 +0000 and data/images/Ubuntu-Studio.ico 2012-11-16 07:05:21 +0000 differ
7=== modified file 'data/isolist.ini'
8--- data/isolist.ini 2012-09-28 11:50:01 +0000
9+++ data/isolist.ini 2012-11-16 07:05:21 +0000
10@@ -119,3 +119,30 @@
11 metalink2=http://cdimage.ubuntu.com/lubuntu/daily-live/current/quantal-desktop-amd64.metalink
12 website=http://lubuntu.net
13 ordering=7
14+
15+[Ubuntu-Studio-i386]
16+min_iso_size=1500000000
17+max_iso_size=3500000000
18+min_disk_space_mb=10000
19+min_memory_mb=512
20+arch=i386
21+name=Ubuntu-Studio
22+packages=ubuntustudio-desktop
23+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/12.10/release/ubuntustudio-12.10-dvd-i386.metalink
24+metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/quantal-dvd-i386.metalink
25+website=http://ubuntustudio.org
26+ordering=8
27+
28+[Ubuntu-Studio-amd64]
29+min_iso_size=1500000000
30+max_iso_size=3500000000
31+min_disk_space_mb=10000
32+min_memory_mb=512
33+arch=amd64
34+name=Ubuntu-Studio
35+packages=ubuntustudio-desktop
36+metalink=http://cdimage.ubuntu.com/ubuntustudio/releases/12.10/release/ubuntustudio-12.10-dvd-amd64.metalink
37+metalink2=http://cdimage.ubuntu.com/ubuntustudio/dvd/current/quantal-dvd-amd64.metalink
38+website=http://ubuntustudio.org
39+ordering=8
40+
41
42=== modified file 'debian/changelog'
43--- debian/changelog 2012-10-08 14:22:46 +0000
44+++ debian/changelog 2012-11-16 07:05:21 +0000
45@@ -10,7 +10,10 @@
46 cdimage.ubuntu.com in 12.04.
47 * Add support for Tibetan.
48
49- -- Evan Dandrea <ev@ubuntu.com> Wed, 06 Jun 2012 14:54:06 +0100
50+ [ Howard Chan ]
51+ * Added Ubuntu Studio option into Wubi (LP: #1070682)
52+
53+ -- Howard Chan <smartboyhw@gmail.com> Thu, 15 Nov 2012 19:48:09 +0800
54
55 wubi (12.04) precise; urgency=low
56

Subscribers

People subscribed via source and target branches

to status/vote changes: