Merge lp:~tom-gall/linaro-seeds/platform.natty into lp:~linaro-maintainers/linaro-seeds/platform.natty

[Tom Gall]

Merge in upstream work.

[Steve Langasek (vorlon)]

looks fine to me, but I don't think it brings any benefit to merge this before alpha-2; postponing to the end of the week to avoid shaking anything up while we're preparing the milestone, please ping again then.

review: Approve

=== modified file 'desktop-common'
--- desktop-common	2010-09-06 11:22:35 +0000
+++ desktop-common	2011-01-31 22:19:00 +0000
@@ -37,7 +37,6 @@
  * bc
  * dc
  * genisoimage
- * screen
  * lftp
  * zip
  * unzip                # also used for .zip support in file-roller
@@ -98,6 +97,7 @@
  * (ttf-punjabi-fonts)
  * (ttf-thai-tlwg)
  * (ttf-lao)
+ * (ttf-ubuntu-font-family)
 
 = Other =
 
@@ -105,3 +105,4 @@
  * libxp6 # required for some third party apps. See #21953
  * (kerneloops-daemon) # watch for and allow reporting of kernel problems
  * (policykit-desktop-privileges) # passwordless disk/CPU speed/time operations for admins
+ * ubuntu-extras-keyring # archive signing key for extras.ubuntu.com

=== modified file 'installer'
--- installer	2010-09-06 10:05:32 +0000
+++ installer	2011-01-31 22:19:00 +0000
@@ -27,7 +27,6 @@
  * choose-mirror
  * clock-setup
  * debootstrap-udeb
- * dhcp3-client-udeb
  * di-utils
  * di-utils-mapdevfs
  * di-utils-reboot
@@ -48,6 +47,7 @@
  * initrd-preseed
  * installation-locale
  * installation-report
+ * isc-dhcp-client-udeb
  * iso-3166-udeb
  * iso-scan # for USB boot
  * jfsutils-udeb
@@ -181,24 +181,24 @@
 
 == amd64 ==
 
- * Kernel-Version: 2.6.35-20-generic
+ * Kernel-Version: 2.6.38-1-generic
  * /^.*-firmware-.*-di/ [amd64]
  * /^.*-modules-.*-di/ [amd64]
 
 == armel ==
 
- * Kernel-Version: 2.6.32-409-dove 2.6.35-20-omap 2.6.34-901-omap4 2.6.31-800-st1-5 2.6.35-20-iop32x 2.6.35-20-ixp4xx 2.6.35-20-orion5x 2.6.35-20-versatile
+ * Kernel-Version: 2.6.32-410-dove 2.6.38-1-omap 2.6.35-1101-omap4 2.6.31-800-st1-5 2.6.38-1-iop32x 2.6.37-10-ixp4xx 2.6.38-1-orion5x 2.6.38-1-versatile
  * /^.*-firmware-.*-di/ [armel]
  * /^.*-modules-.*-di/ [armel]
 
 == i386 ==
 
- * Kernel-Version: 2.6.35-20-generic 2.6.35-20-generic-pae
+ * Kernel-Version: 2.6.38-1-generic 2.6.38-1-generic-pae
  * /^.*-firmware-.*-di/ [i386]
  * /^.*-modules-.*-di/ [i386]
 
 == powerpc ==
 
- * Kernel-Version: 2.6.35-20-powerpc 2.6.35-20-powerpc64-smp
+ * Kernel-Version: 2.6.38-1-powerpc 2.6.38-1-powerpc64-smp
  * /^.*-firmware-.*-di/ [powerpc]
  * /^.*-modules-.*-di/ [powerpc]

=== modified file 'installer-gtk'
--- installer-gtk	2008-11-21 12:29:48 +0000
+++ installer-gtk	2011-01-31 22:19:00 +0000
@@ -2,14 +2,20 @@
 
  * cdebconf-gtk-entropy
  * cdebconf-gtk-terminal
+ * gtk2-engines-udeb
  * rootskel-gtk
  * ttf-cjk-compact-udeb
  * ttf-dejavu-udeb
  * ttf-farsiweb-udeb
  * ttf-freefont-udeb
+ * ttf-kannada-fonts-udeb
  * ttf-khmeros-udeb
  * ttf-malayalam-fonts-udeb
  * ttf-sil-abyssinica-udeb
  * ttf-tamil-fonts-udeb
+ * ttf-telugu-fonts-udeb
  * ttf-thai-tlwg-udeb
  * ttf-tmuni-udeb
+ * xserver-xorg-core-udeb
+ * xserver-xorg-input-evdev-udeb
+ * xserver-xorg-video-fbdev-udeb

=== modified file 'live-common'
--- live-common	2010-08-27 16:10:56 +0000
+++ live-common	2011-01-31 22:19:00 +0000
@@ -9,7 +9,7 @@
 
 # workaround for a broken aufs (e. g. LP #587888); also needs cdimage change to
 # use union=unionfs-fuse kernel parameter
-# * unionfs-fuse
+ * unionfs-fuse
 
 # * (bootchart) [!armel] # scheduled for removal before maverick beta
 

=== modified file 'minimal'
--- minimal	2010-09-06 10:05:32 +0000
+++ minimal	2011-01-31 22:19:00 +0000
@@ -48,7 +48,7 @@
 
 These provide various networking services, all should be configured in a client-only state with the server de-activated unless the user requires it.
 
- * dhcp3-client   # LaMontJones
+ * isc-dhcp-client   # LaMontJones
  * iproute
  * ifupdown
  * net-tools

=== modified file 'standard'
--- standard	2010-08-25 22:31:59 +0000
+++ standard	2011-01-31 22:19:00 +0000
@@ -53,7 +53,6 @@
  * (pppoeconf)
  * (openssh-client) # ColinWatson
  * rsync          # would be just client but they are the same binary apparently
- * (w3m)          # we need some text-based html presenter
  * wget           # FabioMassimoDiNitto
 
 = Debugging and Diagnostics =

=== modified file 'supported-development-common'
--- supported-development-common	2010-06-25 14:26:25 +0000
+++ supported-development-common	2011-01-31 22:19:00 +0000
@@ -24,6 +24,8 @@
  * ant1.8-optional	# Java development, drop it if ant is updated to 1.8
  * ant1.8-doc
  * texinfo-doc-nonfree  # GFD'd documentation for texinfo
+ * gcj-4.5-jdk		# keep these here, will be in main in natty
+ * libgcj11-dbg
 
 == Revision Control ==
 
@@ -57,12 +59,15 @@
 
 = Libraries =
 
- * libcrypt-blowfish-perl
  * libdate-manip-perl
  * libnet-ldap-perl
  * libfile-rsyncp-perl
  * libnss-db
  * tdsodbc
+ * libdbd-sqlite3
+ * libdbd-mysql
+ * libdbd-pgsql
+ * libdbd-freetds
 
 = Misc =
 

=== modified file 'supported-development-desktop'
--- supported-development-desktop	2010-04-06 18:42:11 +0000
+++ supported-development-desktop	2011-01-31 22:19:00 +0000
@@ -43,10 +43,16 @@
  * libgd-graph-perl
  * libtemplate-perl
 
+= Python2.x =
+
+ * idle
+ * idle-python2.7
+ * python2.7-examples
+
 = Python3 =
 
  * python3-doc
- * idle
+ * idle3
  * python3-all-dev
  * python3-all-dbg
  * python3-examples

=== modified file 'supported-hardware-common'
--- supported-hardware-common	2010-08-26 11:09:12 +0000
+++ supported-hardware-common	2011-01-31 22:19:00 +0000
@@ -3,10 +3,10 @@
  * powertop
  * ps3-kboot       # boot loader for Sony PlayStation 3
  * ethtool
- * u-boot-omap3 [armel]                   # omap3 second stage bootloader
+ * u-boot-linaro-omap3-beagle [armel]                   # omap3 second stage bootloader
  * u-boot-linaro-omap4-panda [armel]      # omap4 second stage bootloader
- * x-loader-omap [armel]                  # omap3 first stage bootloader
- * x-loader-omap4 [armel]                 # omap4 first stage bootloader
+ * x-loader-omap3-beagle [armel]                  # omap3 first stage bootloader
+ * x-loader-omap4-panda [armel]                 # omap4 first stage bootloader
 
 == Filesystems ==
 

=== modified file 'supported-installer-common'
--- supported-installer-common	2010-09-06 10:05:32 +0000
+++ supported-installer-common	2011-01-31 22:19:00 +0000
@@ -1,7 +1,7 @@
 = Installer =
 
  # Used for netboot installations
- * Kernel-Version: 2.6.35-20-generic-pae 2.6.35-20-virtual
+ * Kernel-Version: 2.6.38-1-generic-pae 2.6.38-1-virtual
  * /^.*-firmware-.*-di/ [amd64 i386]
  * /^.*-modules-.*-di/ [amd64 i386]
 

=== modified file 'supported-kernel-common'
--- supported-kernel-common	2010-09-06 10:05:32 +0000
+++ supported-kernel-common	2011-01-31 22:19:00 +0000
@@ -1,6 +1,6 @@
 == Kernel ==
 
- * /^linux-(backports-modules-(alsa|headers|nouveau|wireless)-lucid-|headers-)?(386|cell|dove|ec2|generic|omap|omap4|powerpc|ps3|server|virtual).*/
+ * /^linux-(backports-modules-(alsa|headers|net|wireless)-maverick-|headers-)?(386|cell|dove|ec2|generic|omap|omap4|powerpc|ps3|server|virtual).*/
  * /^linux-(image|headers)-versatile/
  * linux-doc
  * linux-source
@@ -14,3 +14,4 @@
 
  * linux-image-2.6.31-800-st1-5 [armel]
  * linux-headers-2.6.31-800-st1-5 [armel]
+ * linux-ti-omap4-tools-* [armel]

=== modified file 'supported-misc-servers'
--- supported-misc-servers	2010-08-10 21:44:56 +0000
+++ supported-misc-servers	2011-01-31 22:19:00 +0000
@@ -36,7 +36,6 @@
 Printing:
 
  * m2300w  # Driver for the Minolta magicolor 2300W/24000W color laser printers 
- * openprinting-ppds-extra          # Less common printer drivers we don't want in desktop
 
 Utilities: