Merge lp:~logan/ubuntu/raring/lowmem/debian-merge into lp:ubuntu/raring/lowmem

[Logan Rosen]

[Sebastien Bacher (seb128)]

Thank you for your work!

=== modified file 'README'
--- README	2008-11-05 12:55:14 +0000
+++ README	2012-11-20 02:06:29 +0000
@@ -113,8 +113,8 @@
 The level1 value should be set to the lowest amount of memory that will support
 an install not in lowmem mode. (This is the max memory footprint of the
 installer in non lowmem mode up to running the partitioner and swapon.) Use
-Portuguese as language and choose Guided partitioning with all partitions
-separate to test this!
+Portuguese as language (because that will ask for country and timezone) and
+choose Guided partitioning with all partitions separate to test this!
 
 The level2 value should be set to the lowest amount of memory that will support
 an install in lowmem mode. (This is the max memory footprint of the installer
 
=== modified file 'debian-installer-startup.d/S15lowmem'
--- debian-installer-startup.d/S15lowmem	2011-10-17 11:59:18 +0000
+++ debian-installer-startup.d/S15lowmem	2012-11-20 02:06:29 +0000
@@ -15,36 +15,35 @@
 			min=39
 		;;
 		amd64)
-			level1=71 # MT=72976, qemu: -m 80
-			level2=67 # MT=68880, qemu: -m 76
-			min=51    # MT=52496, qemu: -m 60
+			level1=97 # MT=98352, qemu: -m 105
+			level2=97 # MT=98352, qemu: -m 105
+			min=82    # MT=82992, qemu: -m 90
 		;;
 		arm|armel|armhf)
-			level1=32 # MT=32792, qemu: -m 36
-			level2=28 # MT=28752, qemu: -m 32
-			min=24
+			level1=76 # MT=77036, qemu: -m 80
+			level2=76 # MT=77036, qemu: -m 80
+			min=27    # MT=27316, qemu: -m 31
 		;;
 		armeb)
+		# Update needed
 			level1=32 # MT=32792, qemu: -m 36
 			level2=21
 			min=18
 		;;
 		i386)
-			level1=51 # MT=52416, qemu: -m 56
-			level2=51 # MT=52416, qemu: -m 56
-			min=39    # MT=40224, qemu: -m 44
+			level1=90 # MT=91480, qemu: -m 95
+			level2=90 # MT=91480, qemu: -m 95
+			min=75    # MT=76248, qemu: -m 80
 		;;
 		mips)
-		# Update needed
-			level1=57
-			level2=33
-			min=21
+			level1=78 # MT=79788, qemu: -m 85
+			level2=78 # MT=79788, qemu: -m 85
+			min=27    # MT=27004, qemu: -m 33
 		;;
 		mipsel)
-		# Update needed
-			level1=60
-			level2=33
-			min=19
+			level1=78 # MT=79788, qemu: -m 85
+			level2=74 # MT=74760, qemu: -m 80
+			min=27    # MT=27004, qemu: -m 33
 		;;
 		m68k)
 		# Update needed
@@ -64,6 +63,21 @@
 			level2=36
 			min=28
 		;;
+		kfreebsd-amd64)
+			level1=64 # MT=66456, qemu: -m 146
+			level2=32 # MT=33688, qemu: -m 114
+			min=29    # MT=29592, qemu: -m 110
+		;;
+		kfreebsd-i386)
+			level1=64 # MT=66008, qemu: -m 121
+			level2=32 # MT=33240, qemu: -m 89
+			min=19    # MT=18904, qemu: -m 75
+		;;
+		hurd-i386)
+			level1=349 # MT=358392, qemu: -m 350
+			level2=349 # MT=358392, qemu: -m 350
+			min=349    # MT=358392, qemu: -m 350
+		;;
 		*)
 			level1=64
 			level2=32
 
=== modified file 'debian/changelog'
--- debian/changelog	2012-09-28 14:11:37 +0000
+++ debian/changelog	2012-11-20 02:06:29 +0000
@@ -1,3 +1,19 @@
+lowmem (1.36ubuntu1) raring; urgency=low
+
+  * Merge from Debian unstable. Remaining changes:
+    - Don't install the desktop in lowmem mode.
+    - Even in lowmem mode, leave the framebuffer enabled if vga= is found on
+      the kernel command line.
+
+ -- Logan Rosen <[e-mail]>  Mon, 19 Nov 2012 21:00:14 -0500
+
+lowmem (1.36) unstable; urgency=low
+
+  [ Samuel Thibault ]
+  * Update lowmem limits.
+
+ -- Christian Perrier <[e-mail]>  Tue, 18 Sep 2012 06:52:37 +0200
+
 lowmem (1.35ubuntu2) quantal; urgency=low
 
   * Even in lowmem mode, leave the framebuffer enabled if vga= is found on