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

[Brian Murray]

[lp:~brian-murray/debian-installer/bug-758942]

1490. By Brian Murray on 2011-07-11

also update help.xml

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'build/boot/x86/f2.txt'
--- build/boot/x86/f2.txt	2010-05-24 15:01:07 +0000
+++ build/boot/x86/f2.txt	2011-07-11 15:27:57 +0000
@@ -3,8 +3,8 @@
 You must have at least 44 megabytes of RAM to use this Ubuntu installer.
 
 You should have space on your hard disk to create a new disk partition
-of at least 2 gigabytes to install a standard Ubuntu desktop system or
-at least 400 megabytes for a minimal server installation. You'll need
+of at least 5 gigabytes to install a standard Ubuntu desktop system or
+at least 500 megabytes for a minimal server installation. You'll need
 more disk space to install additional packages, depending on what you
 wish to do with your new Ubuntu system.
 
 
=== modified file 'build/boot/x86/help.xml'
--- build/boot/x86/help.xml	2011-03-15 11:12:37 +0000
+++ build/boot/x86/help.xml	2011-07-11 15:27:57 +0000
@@ -121,8 +121,8 @@
 
   <para condition="install">
    You should have space on your hard disk to create a new disk partition of
-   at least 2 gigabytes to install a standard Ubuntu desktop system or at
-   least 400 megabytes for a minimal server installation. You'll need more
+   at least 5 gigabytes to install a standard Ubuntu desktop system or at
+   least 500 megabytes for a minimal server installation. You'll need more
    disk space to install additional packages, depending on what you wish to
    do with your new Ubuntu system.
   </para>
 
=== modified file 'debian/changelog'
--- debian/changelog	2011-07-09 21:14:26 +0000
+++ debian/changelog	2011-07-11 15:27:57 +0000
@@ -1,3 +1,10 @@
+debian-installer (20101020ubuntu46) oneiric; urgency=low
+
+  * Update minimum disk space requirements for installing Ubuntu.  Thanks to
+    Matheus de Araújo for the patch.  (LP: #758942) 
+
+ -- Brian Murray <[e-mail]>  Mon, 11 Jul 2011 07:58:33 -0700
+
 debian-installer (20101020ubuntu45) oneiric; urgency=low
 
   * Move to 3.0.0-4 kernels.