Merge lp:~brian-murray/debian-installer/bug-758942 into lp:~ubuntu-core-dev/debian-installer/ubuntu

Proposed by Brian Murray
Status: Merged
Merged at revision: 1489
Proposed branch: lp:~brian-murray/debian-installer/bug-758942
Merge into: lp:~ubuntu-core-dev/debian-installer/ubuntu
Diff against target: 44 lines (+11/-4)
3 files modified
build/boot/x86/f2.txt (+2/-2)
build/boot/x86/help.xml (+2/-2)
debian/changelog (+7/-0)
To merge this branch: bzr merge lp:~brian-murray/debian-installer/bug-758942
Reviewer Review Type Date Requested Status
Colin Watson Approve
Review via email: mp+67560@code.launchpad.net
To post a comment you must log in.
1490. By Brian Murray

also update help.xml

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'build/boot/x86/f2.txt'
2--- build/boot/x86/f2.txt 2010-05-24 15:01:07 +0000
3+++ build/boot/x86/f2.txt 2011-07-11 15:27:57 +0000
4@@ -3,8 +3,8 @@
5 You must have at least 44 megabytes of RAM to use this Ubuntu installer.
6
7 You should have space on your hard disk to create a new disk partition
8-of at least 2 gigabytes to install a standard Ubuntu desktop system or
9-at least 400 megabytes for a minimal server installation. You'll need
10+of at least 5 gigabytes to install a standard Ubuntu desktop system or
11+at least 500 megabytes for a minimal server installation. You'll need
12 more disk space to install additional packages, depending on what you
13 wish to do with your new Ubuntu system.
14
15
16=== modified file 'build/boot/x86/help.xml'
17--- build/boot/x86/help.xml 2011-03-15 11:12:37 +0000
18+++ build/boot/x86/help.xml 2011-07-11 15:27:57 +0000
19@@ -121,8 +121,8 @@
20
21 <para condition="install">
22 You should have space on your hard disk to create a new disk partition of
23- at least 2 gigabytes to install a standard Ubuntu desktop system or at
24- least 400 megabytes for a minimal server installation. You'll need more
25+ at least 5 gigabytes to install a standard Ubuntu desktop system or at
26+ least 500 megabytes for a minimal server installation. You'll need more
27 disk space to install additional packages, depending on what you wish to
28 do with your new Ubuntu system.
29 </para>
30
31=== modified file 'debian/changelog'
32--- debian/changelog 2011-07-09 21:14:26 +0000
33+++ debian/changelog 2011-07-11 15:27:57 +0000
34@@ -1,3 +1,10 @@
35+debian-installer (20101020ubuntu46) oneiric; urgency=low
36+
37+ * Update minimum disk space requirements for installing Ubuntu. Thanks to
38+ Matheus de Araújo for the patch. (LP: #758942)
39+
40+ -- Brian Murray <brian@ubuntu.com> Mon, 11 Jul 2011 07:58:33 -0700
41+
42 debian-installer (20101020ubuntu45) oneiric; urgency=low
43
44 * Move to 3.0.0-4 kernels.

Subscribers

People subscribed via source and target branches