Linaro Seeds

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

  1. platform.natty
  2. Merge into platform.natty
Proposed by Tom Gall
Status: Merged
Merged at revision: 1562
Proposed branch: lp:~tom-gall/linaro-seeds/platform.natty
Merge into: lp:~linaro-maintainers/linaro-seeds/platform.natty
Diff against target: 247 lines (+34/-17)
12 files modified
desktop-common (+2/-1)
installer (+5/-5)
installer-gtk (+6/-0)
live-common (+1/-1)
minimal (+1/-1)
standard (+0/-1)
supported-development-common (+6/-1)
supported-development-desktop (+7/-1)
supported-hardware-common (+3/-3)
supported-installer-common (+1/-1)
supported-kernel-common (+2/-1)
supported-misc-servers (+0/-1)
To merge this branch: bzr merge lp:~tom-gall/linaro-seeds/platform.natty
Reviewer Review Type Date Requested Status
Steve Langasek (community) Approve
Review via email: mp+48068@code.launchpad.net

Description of the change

Merge in upstream work.

To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
37 * bc37 * bc
38 * dc38 * dc
39 * genisoimage39 * genisoimage
40 * screen
41 * lftp40 * lftp
42 * zip41 * zip
43 * unzip # also used for .zip support in file-roller42 * unzip # also used for .zip support in file-roller
@@ -98,6 +97,7 @@
98 * (ttf-punjabi-fonts)97 * (ttf-punjabi-fonts)
99 * (ttf-thai-tlwg)98 * (ttf-thai-tlwg)
100 * (ttf-lao)99 * (ttf-lao)
100 * (ttf-ubuntu-font-family)
101101
102= Other =102= Other =
103103
@@ -105,3 +105,4 @@
105 * libxp6 # required for some third party apps. See #21953105 * libxp6 # required for some third party apps. See #21953
106 * (kerneloops-daemon) # watch for and allow reporting of kernel problems106 * (kerneloops-daemon) # watch for and allow reporting of kernel problems
107 * (policykit-desktop-privileges) # passwordless disk/CPU speed/time operations for admins107 * (policykit-desktop-privileges) # passwordless disk/CPU speed/time operations for admins
108 * ubuntu-extras-keyring # archive signing key for extras.ubuntu.com
108109
=== modified file 'installer'
--- installer 2010-09-06 10:05:32 +0000
+++ installer 2011-01-31 22:19:00 +0000
@@ -27,7 +27,6 @@
27 * choose-mirror27 * choose-mirror
28 * clock-setup28 * clock-setup
29 * debootstrap-udeb29 * debootstrap-udeb
30 * dhcp3-client-udeb
31 * di-utils30 * di-utils
32 * di-utils-mapdevfs31 * di-utils-mapdevfs
33 * di-utils-reboot32 * di-utils-reboot
@@ -48,6 +47,7 @@
48 * initrd-preseed47 * initrd-preseed
49 * installation-locale48 * installation-locale
50 * installation-report49 * installation-report
50 * isc-dhcp-client-udeb
51 * iso-3166-udeb51 * iso-3166-udeb
52 * iso-scan # for USB boot52 * iso-scan # for USB boot
53 * jfsutils-udeb53 * jfsutils-udeb
@@ -181,24 +181,24 @@
181181
182== amd64 ==182== amd64 ==
183183
184 * Kernel-Version: 2.6.35-20-generic184 * Kernel-Version: 2.6.38-1-generic
185 * /^.*-firmware-.*-di/ [amd64]185 * /^.*-firmware-.*-di/ [amd64]
186 * /^.*-modules-.*-di/ [amd64]186 * /^.*-modules-.*-di/ [amd64]
187187
188== armel ==188== armel ==
189189
190 * 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-versatile190 * 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
191 * /^.*-firmware-.*-di/ [armel]191 * /^.*-firmware-.*-di/ [armel]
192 * /^.*-modules-.*-di/ [armel]192 * /^.*-modules-.*-di/ [armel]
193193
194== i386 ==194== i386 ==
195195
196 * Kernel-Version: 2.6.35-20-generic 2.6.35-20-generic-pae196 * Kernel-Version: 2.6.38-1-generic 2.6.38-1-generic-pae
197 * /^.*-firmware-.*-di/ [i386]197 * /^.*-firmware-.*-di/ [i386]
198 * /^.*-modules-.*-di/ [i386]198 * /^.*-modules-.*-di/ [i386]
199199
200== powerpc ==200== powerpc ==
201201
202 * Kernel-Version: 2.6.35-20-powerpc 2.6.35-20-powerpc64-smp202 * Kernel-Version: 2.6.38-1-powerpc 2.6.38-1-powerpc64-smp
203 * /^.*-firmware-.*-di/ [powerpc]203 * /^.*-firmware-.*-di/ [powerpc]
204 * /^.*-modules-.*-di/ [powerpc]204 * /^.*-modules-.*-di/ [powerpc]
205205
=== 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 @@
22
3 * cdebconf-gtk-entropy3 * cdebconf-gtk-entropy
4 * cdebconf-gtk-terminal4 * cdebconf-gtk-terminal
5 * gtk2-engines-udeb
5 * rootskel-gtk6 * rootskel-gtk
6 * ttf-cjk-compact-udeb7 * ttf-cjk-compact-udeb
7 * ttf-dejavu-udeb8 * ttf-dejavu-udeb
8 * ttf-farsiweb-udeb9 * ttf-farsiweb-udeb
9 * ttf-freefont-udeb10 * ttf-freefont-udeb
11 * ttf-kannada-fonts-udeb
10 * ttf-khmeros-udeb12 * ttf-khmeros-udeb
11 * ttf-malayalam-fonts-udeb13 * ttf-malayalam-fonts-udeb
12 * ttf-sil-abyssinica-udeb14 * ttf-sil-abyssinica-udeb
13 * ttf-tamil-fonts-udeb15 * ttf-tamil-fonts-udeb
16 * ttf-telugu-fonts-udeb
14 * ttf-thai-tlwg-udeb17 * ttf-thai-tlwg-udeb
15 * ttf-tmuni-udeb18 * ttf-tmuni-udeb
19 * xserver-xorg-core-udeb
20 * xserver-xorg-input-evdev-udeb
21 * xserver-xorg-video-fbdev-udeb
1622
=== 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 @@
99
10# workaround for a broken aufs (e. g. LP #587888); also needs cdimage change to10# workaround for a broken aufs (e. g. LP #587888); also needs cdimage change to
11# use union=unionfs-fuse kernel parameter11# use union=unionfs-fuse kernel parameter
12# * unionfs-fuse12 * unionfs-fuse
1313
14# * (bootchart) [!armel] # scheduled for removal before maverick beta14# * (bootchart) [!armel] # scheduled for removal before maverick beta
1515
1616
=== modified file 'minimal'
--- minimal 2010-09-06 10:05:32 +0000
+++ minimal 2011-01-31 22:19:00 +0000
@@ -48,7 +48,7 @@
4848
49These provide various networking services, all should be configured in a client-only state with the server de-activated unless the user requires it.49These provide various networking services, all should be configured in a client-only state with the server de-activated unless the user requires it.
5050
51 * dhcp3-client # LaMontJones51 * isc-dhcp-client # LaMontJones
52 * iproute52 * iproute
53 * ifupdown53 * ifupdown
54 * net-tools54 * net-tools
5555
=== modified file 'standard'
--- standard 2010-08-25 22:31:59 +0000
+++ standard 2011-01-31 22:19:00 +0000
@@ -53,7 +53,6 @@
53 * (pppoeconf)53 * (pppoeconf)
54 * (openssh-client) # ColinWatson54 * (openssh-client) # ColinWatson
55 * rsync # would be just client but they are the same binary apparently55 * rsync # would be just client but they are the same binary apparently
56 * (w3m) # we need some text-based html presenter
57 * wget # FabioMassimoDiNitto56 * wget # FabioMassimoDiNitto
5857
59= Debugging and Diagnostics =58= Debugging and Diagnostics =
6059
=== 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 @@
24 * ant1.8-optional # Java development, drop it if ant is updated to 1.824 * ant1.8-optional # Java development, drop it if ant is updated to 1.8
25 * ant1.8-doc25 * ant1.8-doc
26 * texinfo-doc-nonfree # GFD'd documentation for texinfo26 * texinfo-doc-nonfree # GFD'd documentation for texinfo
27 * gcj-4.5-jdk # keep these here, will be in main in natty
28 * libgcj11-dbg
2729
28== Revision Control ==30== Revision Control ==
2931
@@ -57,12 +59,15 @@
5759
58= Libraries =60= Libraries =
5961
60 * libcrypt-blowfish-perl
61 * libdate-manip-perl62 * libdate-manip-perl
62 * libnet-ldap-perl63 * libnet-ldap-perl
63 * libfile-rsyncp-perl64 * libfile-rsyncp-perl
64 * libnss-db65 * libnss-db
65 * tdsodbc66 * tdsodbc
67 * libdbd-sqlite3
68 * libdbd-mysql
69 * libdbd-pgsql
70 * libdbd-freetds
6671
67= Misc =72= Misc =
6873
6974
=== 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 @@
43 * libgd-graph-perl43 * libgd-graph-perl
44 * libtemplate-perl44 * libtemplate-perl
4545
46= Python2.x =
47
48 * idle
49 * idle-python2.7
50 * python2.7-examples
51
46= Python3 =52= Python3 =
4753
48 * python3-doc54 * python3-doc
49 * idle55 * idle3
50 * python3-all-dev56 * python3-all-dev
51 * python3-all-dbg57 * python3-all-dbg
52 * python3-examples58 * python3-examples
5359
=== 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 @@
3 * powertop3 * powertop
4 * ps3-kboot # boot loader for Sony PlayStation 34 * ps3-kboot # boot loader for Sony PlayStation 3
5 * ethtool5 * ethtool
6 * u-boot-omap3 [armel] # omap3 second stage bootloader6 * u-boot-linaro-omap3-beagle [armel] # omap3 second stage bootloader
7 * u-boot-linaro-omap4-panda [armel] # omap4 second stage bootloader7 * u-boot-linaro-omap4-panda [armel] # omap4 second stage bootloader
8 * x-loader-omap [armel] # omap3 first stage bootloader8 * x-loader-omap3-beagle [armel] # omap3 first stage bootloader
9 * x-loader-omap4 [armel] # omap4 first stage bootloader9 * x-loader-omap4-panda [armel] # omap4 first stage bootloader
1010
11== Filesystems ==11== Filesystems ==
1212
1313
=== 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 @@
1= Installer =1= Installer =
22
3 # Used for netboot installations3 # Used for netboot installations
4 * Kernel-Version: 2.6.35-20-generic-pae 2.6.35-20-virtual4 * Kernel-Version: 2.6.38-1-generic-pae 2.6.38-1-virtual
5 * /^.*-firmware-.*-di/ [amd64 i386]5 * /^.*-firmware-.*-di/ [amd64 i386]
6 * /^.*-modules-.*-di/ [amd64 i386]6 * /^.*-modules-.*-di/ [amd64 i386]
77
88
=== 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 @@
1== Kernel ==1== Kernel ==
22
3 * /^linux-(backports-modules-(alsa|headers|nouveau|wireless)-lucid-|headers-)?(386|cell|dove|ec2|generic|omap|omap4|powerpc|ps3|server|virtual).*/3 * /^linux-(backports-modules-(alsa|headers|net|wireless)-maverick-|headers-)?(386|cell|dove|ec2|generic|omap|omap4|powerpc|ps3|server|virtual).*/
4 * /^linux-(image|headers)-versatile/4 * /^linux-(image|headers)-versatile/
5 * linux-doc5 * linux-doc
6 * linux-source6 * linux-source
@@ -14,3 +14,4 @@
1414
15 * linux-image-2.6.31-800-st1-5 [armel]15 * linux-image-2.6.31-800-st1-5 [armel]
16 * linux-headers-2.6.31-800-st1-5 [armel]16 * linux-headers-2.6.31-800-st1-5 [armel]
17 * linux-ti-omap4-tools-* [armel]
1718
=== 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 @@
36Printing:36Printing:
3737
38 * m2300w # Driver for the Minolta magicolor 2300W/24000W color laser printers 38 * m2300w # Driver for the Minolta magicolor 2300W/24000W color laser printers
39 * openprinting-ppds-extra # Less common printer drivers we don't want in desktop
4039
41Utilities:40Utilities:
4241

Subscribers

People subscribed via source and target branches

to all changes: