Merge lp:~james-page/ubuntu-seeds/ubuntu.natty-fix.701218 into lp:~ubuntu-core-dev/ubuntu-seeds/platform.natty

[James Page]

print-server task updated to remove openprinting-ppds-extra as now part of openprinting-ppds and no longer required.

Unmerged revisions

1774. By James Page on 2011-01-10

Removed openprinting-ppds-extra from print-server task as no longer required

1773. By Dustin Kirkland  on 2011-01-10

screen's recommendation of byobu was dropped recently; add byobu directly
to the server seed

1772. By Didier Roche-Tolomelli on 2011-01-06

replace rhythmbox by banshee and make jcastro happy

1771. By Martin Pitt on 2011-01-05

put back French langpack

1770. By Martin Pitt on 2011-01-05

remove evolution-couchdb, the U1 control panel will install it on demand

1769. By Martin Pitt on 2011-01-03

put back gnome-system-tools; gnome-control-center 3 will not land in natty

1768. By Colin Watson on 2010-12-09

switch server Task-Key from ubuntu-serverguide to screen, since ubuntu-serverguide is no longer in the archive (LP: #672755)

1767. By Colin Watson on 2010-12-09

switch from dhcp3 (transitional packages) to isc-dhcp

1766. By Didier Roche-Tolomelli on 2010-11-19

add unity to the desktop seed

1765. By Robert Ancell on 2010-11-11

Now gnome-utils is split, list the separate packages. Drop gnome-dictionary

=== modified file 'STRUCTURE'
--- STRUCTURE	2010-04-11 01:54:14 +0000
+++ STRUCTURE	2011-01-10 23:16:58 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 feature follow-recommends
 required:
 minimal: required
@@ -26,3 +27,35 @@
 supported-server: supported-misc-servers supported-hardware-common supported-installer-common supported-network-common supported-sysadmin-common build-essential supported-development-common supported-kernel-common
 supported-desktop: supported-hardware-desktop supported-installer-desktop supported-sysadmin-desktop supported-hardware-common supported-installer-common supported-network-common supported-network-client supported-sysadmin-common build-essential supported-development-common supported-development-desktop supported-kernel-common supported-kernel-desktop
 supported-common: supported-server supported-desktop 
+=======
+include platform.natty
+desktop: desktop-common
+dns-server: standard
+lamp-server: standard
+openssh-server: standard
+print-server: standard
+samba-server: standard
+postgresql-server: standard
+mail-server: standard
+tomcat-server: standard
+virt-host: standard
+eucalyptus-cloud: server
+eucalyptus-walrus: server
+eucalyptus-cluster: server
+eucalyptus-storage: server
+eucalyptus-simple-cluster: eucalyptus-cloud eucalyptus-walrus eucalyptus-cluster eucalyptus-storage
+eucalyptus-node: server
+server: standard
+server-ship: boot installer dns-server lamp-server openssh-server print-server samba-server postgresql-server mail-server server tomcat-server virt-host eucalyptus-simple-cluster eucalyptus-node d-i-requirements
+uec: standard
+uec-live: standard
+ship: boot installer desktop d-i-requirements
+live: desktop live-common
+dvd-live: live
+ship-live: boot live
+development: desktop
+dvd: server-ship ship development supported-common
+supported-desktop-extra: dvd dvd-live
+# make sure supported remains the last entry
+supported: dvd-live ship-live uec-live dvd language-packs supported-desktop-extra
+>>>>>>> MERGE-SOURCE

=== renamed file 'boot' => 'boot.THIS'
=== removed file 'build-essential'
--- build-essential	2007-06-23 20:10:57 +0000
+++ build-essential	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-This seed is used to implement the debootstrap buildd variant. It doesn't include build-essential itself since that historically hasn't been in the buildd chroots, being only informational.
-
- * apt
- * dpkg-dev
- * gcc
- * g++
- * libc6-dev [!alpha !ia64]
- * libc6.1-dev [alpha ia64]
- * make

=== modified file 'd-i-requirements'
--- d-i-requirements	2010-08-31 16:00:34 +0000
+++ d-i-requirements	2011-01-10 23:16:58 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 These packages may be installed dynamically by d-i based on installation
 parameters. They should generally be made available on CDs.
 
@@ -19,23 +20,113 @@
  * dmraid
  * cryptsetup
  * ecryptfs-utils
-
-== For language support in the installer ==
-
- * console-terminus
- * unifont
+=======
+== Kernel ==
+
+ * linux [amd64 i386]
+
+== Desktop ==
+
+A small first step to comprehensive certification. Unfortunately, lsb
+includes lsb-desktop, which pulls in both gtk and qt, so we pick individual
+modules instead.
+
+ * lsb-core [amd64 i386]
+ * lsb-cxx [amd64 i386]
+ * lsb-graphics [amd64 i386]
+
+== Server ==
+
+ * ssh
+ * nfs-kernel-server   # need an NFS server
+ * ltsp-server-standalone [amd64 i386] # for LTSP-on-install
+ * ltsp-client [amd64 i386]            # for LTSP-on-install
+ * ldm [amd64 i386] # seeded because its not a hard dependency of ltsp-client anymore
+ * ldm-ubuntu-theme [amd64 i386] # seeded to make it available for LTSP-on-install
+
+== Networking ==
+
+ * bsd-mailx
+ * vlan                   # userland tools to config 8021q support
+
+== Development ==
+
+ * build-essential
+ * fakeroot
+ * bzr [i386]          # amd64 CD overflowing, and the package became a hog
+
+== Common UNIX stuff ==
+
+ * nfs-common		  # allows people to access NFS filesystems
+ # * vim                    # vim-tiny is in minimal; vim includes syntax highlighting, help files, etc.
+>>>>>>> MERGE-SOURCE
 
 == Hardware & Network Access ==
 
+<<<<<<< TREE
  * mouseemu	# needed on Macs with single-button mice
  * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems
  * elfspe2 [powerpc] # SPE access for Cell systems
-
+=======
+ * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
+ * eagle-usb-utils        # needed for some ADSL modems
+ * bpalogin
+ * ndiswrapper-utils-1.9 [amd64 i386]
+ * ndisgtk
+
+ * linux-wlan-ng
+ * libatm1	# suggested by ppp for PPP-over-ATM
+ * setserial	# needed by folks with nonstandard serial ports
+ * b43-fwcutter
+>>>>>>> MERGE-SOURCE
+
+<<<<<<< TREE
+=======
+== Common language packs ==
+
+ # must have
+ * Languages: en
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+ * language-support-${Languages}
+
+Enough room on amd64 armel i386, not enough on powerpc:
+ * Languages: es xh pt de
+ * language-pack-${Languages} [!powerpc]
+ * language-pack-gnome-${Languages} [!powerpc]
+
+ * Languages: fr
+ * language-pack-${Languages} [i386]
+ * language-pack-gnome-${Languages} [i386]
+
+# * Languages: bn hi ar ru zh-hans ja
+# * language-pack-${Languages}
+# * language-pack-gnome-${Languages}
+
+>>>>>>> MERGE-SOURCE
 == Installer ==
 
+<<<<<<< TREE
  * grub # needed for dmraid et al
  * grub-efi [amd64]
  * mkvmlinuz [powerpc] # for nobootloader
  * lupin-support [amd64 i386] # installer-for-windows
  * uboot-mkimage [armel] # needed on dove and omap for uboot
  * uboot-envtools [armel] # needed on omap for uboot
+=======
+ * grub # needed for dmraid et al
+ * oem-config-gtk
+ * uboot-mkimage [armel]
+
+== Transitional packages ==
+
+== Germinate workarounds ==
+
+ * wamerican  # iamerican Depends: ispell Recommends: wordlist, but wamerican isn't spotted in time so germinate arbitrarily picks miscfiles instead
+
+== Blacklist ==
+
+libavcodec cannot be shipped on CDs (cf. Ubuntu technical board resolution 2007-01-02).
+
+ * !libavcodec*
+>>>>>>> MERGE-SOURCE

=== added file 'desktop.OTHER'
--- desktop.OTHER	1970-01-01 00:00:00 +0000
+++ desktop.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,231 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu desktop
+Task-Extended-Description: This task provides the Ubuntu desktop environment.
+Task-Key: ubuntu-desktop
+Task-Seeds: desktop-common
+
+= Hardware and Architecture Support =
+
+== Architecture-independent ==
+
+ * libgd2-xpm # force the xpm-enabled version for edubuntu compatibility
+
+Bluetooth:
+
+ * (gnome-bluetooth) # desktop bluetooth support
+ * (bluez-gstreamer)
+
+= Network Services =
+
+Basic network services and Windows integration.
+
+ * (avahi-autoipd)     # IPv4 link-local interface configuration support
+ * (network-manager-gnome) # see NetworkRoaming spec
+ * (network-manager-pptp)
+ * (network-manager-pptp-gnome)
+
+= GUI infrastructure =
+
+ * xterm                         # Provide a backup terminal and complete X env.
+
+Extra fonts (should be common, but not so for space reasons):
+
+ * (ttf-wqy-microhei)
+ * (ttf-unfonts-core)
+ * (ttf-liberation)
+
+Input methods:
+
+ * (im-switch)
+ * (ibus)
+ * (ibus-gtk)
+ * (ibus-table)
+ * (ibus-pinyin)
+ * (ibus-pinyin-db-android)
+
+= Desktop GNOME Apps =
+
+We've chosen GNOME as our desktop user interface of choice. Rather than using the meta-packages they are deliberately expanded so that we can select things a bit better.
+
+ * (apport-gtk)
+ * desktop-file-utils
+ * eog
+ * (evolution)
+ * (evolution-plugins)
+ * (evolution-exchange)
+ * (evolution-webcal)
+ * file-roller
+ * (empathy)
+ * (telepathy-idle)        # basic IRC support for empathy
+ * gcalctool
+ * gconf-editor
+ * gdm
+ * (gdm-guest-session)
+ * gedit
+ * gnome-about
+ * gnome-applets
+ * software-center
+ * (app-install-data-partner)
+ * (gnome-codec-install)    # new default codec installation tool (from debian)
+ * (transmission-gtk)       # simple GNOME frontend for bittorrent downloads
+ * gnome-control-center
+ * system-config-printer-gnome
+ * gnome-icon-theme
+ * gnome-media
+ * gnome-menus
+ * gnome-nettool            # part of 2.8
+ * gnome-panel
+ * gnome-session
+ * seahorse
+ * (libpam-gnome-keyring)
+ * gnome-system-monitor     # SebastienBacher
+ * gnome-power-manager		# OliverGrawert finally ready for shipment
+ * gnome-system-tools
+ * gnome-terminal
+ * baobab
+ * gnome-screenshot
+ * gnome-search-tool
+ * gnome-system-log
+ * (gnome-user-guide)
+ * gucharmap               # SebastienBacher
+ * checkbox-gtk
+ * language-selector	   # MichaelVogt
+ * metacity                # SebastienBacher
+ * (compiz) [i386 powerpc amd64]		   # compiz is our default WM 'mkay
+ * (firefox)
+ * (firefox-gnome-support)
+ * (ubufox)                # ubuntu firefox tweaks - AlexanderSack
+ * nautilus                # SebastienBacher
+ * nautilus-sendto
+ * (nautilus-share)
+ * (banshee)
+ * (banshee-extension-ubuntuonemusicstore)
+ * (brasero)		   # Oliver Grawert
+ * rarian-compat
+ * alacarte		   # default menu editor
+ * ssh-askpass-gnome
+ * synaptic                # default GUI package manager
+ * software-properties-gtk # default GUI sources.list editor
+ * (totem)
+ * (totem-mozilla)
+ * update-manager
+ * update-notifier
+ * (vino) # vnc server
+ * yelp
+ * zenity
+ * (xdg-utils)		   # useful utilities
+ * xdg-user-dirs
+ * xdg-user-dirs-gtk
+ * pulseaudio-esound-compat
+ * pulseaudio
+ * (pulseaudio-module-gconf)
+ * (pulseaudio-module-x11)
+ * (pulseaudio-module-bluetooth)
+ * (gvfs-fuse)			# let non-GNOME apps see GVFS via fuse
+ * launchpad-integration	# Needed to show the launchpad menu items
+ * (gnome-disk-utility)
+
+Games: We only ship a few by default.
+ * (aisleriot)
+ * (gnome-mahjongg)
+ * (gnomine)
+ * (gnome-sudoku)
+ * (quadrapassel)
+ * (gbrainy)
+ * (branding-ubuntu)        # Ubuntu branding for some games
+
+Themes: we will ship only the very best looking themes. We won't ship everything that Debian ships, just a custom package that includes the themes we want. These packages are included for size guidance until we have Ubuntu-specific packages.
+
+ * gnome-themes-selected
+ * gnome-themes-ubuntu
+ * gtk2-engines			# DanielHolbach (gtk2-engines were merged into one package)
+ * gtk2-engines-pixbuf          # Required by some themes the user might install
+ * ubuntu-artwork
+ * ubuntu-sounds
+ * gnome-session-canberra	# Needed to make login/logout sounds audible.
+
+The gstreamer0.10 packages we want to install:
+
+ * gstreamer0.10-alsa
+ * gstreamer0.10-plugins-base-apps
+ * gstreamer0.10-pulseaudio
+
+For Ubuntu we need libsdl1.2debian-pulseaudio for the above gstreamer0.10-plugins-base-apps < libtheora-dev < libsdl1.2-dev < libsdl1.2debian.
+
+ * libsdl1.2debian # tiny and needed for clean CDROM upgrades
+ * libsdl1.2debian-pulseaudio
+
+Accessibility tools:
+
+ * (gnome-accessibility-themes)
+ * (gnome-mag)
+ * (gnome-orca)
+ * (onboard)
+ * (brltty)
+ * (brltty-x11)
+ * (xcursor-themes)
+ * (espeak)
+ * (speech-dispatcher)
+ * (mousetweaks)
+ * (libgail-gnome-module) # Needed for libbonoboui/libgnomeui widget accessibility
+
+= Other Desktop GUI Apps =
+
+ * (openoffice.org-style-human) [i386 amd64 powerpc]  # before OOo to avoid openoffice.org-style-default
+ * (openoffice.org-gnome) [i386 amd64 powerpc]
+ * (openoffice.org-writer) [i386 amd64 powerpc]
+ * (openoffice.org-calc) [i386 amd64 powerpc]
+ * (openoffice.org-impress) [i386 amd64 powerpc]
+ * (openoffice.org-math) [i386 amd64 powerpc]
+ #* (openoffice.org-evolution) [i386 amd64 powerpc] # pulls in oo.o-base, broken ATM
+ * (openoffice.org-help-en-us) [i386 amd64 powerpc]
+ * (simple-scan)
+ * evince
+ * (gnome-screensaver) # recommends to allow for xscreensaver to be used
+ * xscreensaver-gl # MRS, we will only ship a subset of the screensavers from rss-glx and xscreensaver
+ * xscreensaver-data # subset package for the non-gl screensavers we ship
+ * screensaver-default-images
+ * (tsclient)      # rdesktop/vnc/xdmcp client gui
+ * (vinagre)      # needed by tsclient
+ * (tomboy) [i386 powerpc amd64 armel]  # Sebastian Dröge, approved by mdz
+ * (shotwell)
+ * (jockey-gtk) # enable non-free graphics and other drivers easily
+ * (usb-creator-gtk) [i386 amd64]
+ * (computer-janitor-gtk)
+ * (pitivi)
+
+Desktop Experience:
+ * unity
+ * notify-osd           # backend for libnotify
+ * (indicator-messages)
+ * (evolution-indicator)
+ * indicator-applet-session
+
+Online Services:
+ * (ubuntuone-client-gnome)
+
+= Documentation =
+
+ * doc-base			# integrates with scrollkeeper
+ * (ubuntu-docs)
+
+= Development =
+
+Here we provide a minimal development environment sufficient to build kernel
+drivers, so that this is possible on the live CD and in scenarios where
+it is problematic to get these packages onto the installed system in order
+to compile a driver. -mdz
+
+ * (gcc)
+ * (make)
+ * (linux-headers-generic) [i386]
+ * (linux-headers-generic) [amd64]
+ * (linux-headers-dove) [armel]
+
+= Other =
+
+ * ubuntu-desktop # metapackage for everything here
+ * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent)
+ * (libwmf0.2-7-gtk)
+ * (plymouth-theme-ubuntu-logo)

=== added file 'development.OTHER'
--- development.OTHER	1970-01-01 00:00:00 +0000
+++ development.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,61 @@
+Moved from desktop:
+
+ * python-adns              # MRS, stable and useful
+ * python-apt               # MRS, we need to be able to interact with APT
+ * python-cddb              # MRS, great for desktop users to be able to manage CD's in Python
+ * python-clientcookie      # MRS, unless a better cgi-style framework is below
+ * python-crypto            # MRS, very useful even though it's very specific
+ * python-egenix-mxproxy    # MRS, 
+ * python-egenix-mxstack    # MRS, 
+ * python-egenix-mxtexttools # MRS, 
+ * python-egenix-mxtools    # MRS, 
+ * python-epydoc            # MRS, 
+ * python-examples          # MRS, 
+ * python-gd                # MRS, 
+ * python-genetic
+ * python-geoip
+ * python-gnupginterface
+ * python-gst0.10
+ * python-htmlgen
+ * python-id3lib
+ * python-imaging-sane
+ * python-jabber
+ * python-dictclient
+ * python-librdf
+ * python-pycurl
+ * python-ldap
+ * python-mysqldb
+ * python-newt
+ * python-pam
+ * python-pexpect
+ * python-pisock
+ * python-pyao
+ * python-pylibacl
+ * python-pyopenssl
+ * python-pyvorbis
+ * python-pyxattr
+ * python-reportlab
+ * python-simpletal
+ * python-unit
+ * python-xdg                   # SebastienBacher
+ * python-xmpp
+ * python-libxml2
+ * python-libxslt1
+
+Moved from supported:
+
+ * python-pygresql         # JamesTroup, from hoglet
+ * python-nevow
+ * python-twisted
+ * idle             # Python IDE
+ * python-pullparser        # modules, where python2.4-foo is in main
+ * python-gpod
+
+Extra GCC packages
+
+ * gcj-4.4-source
+ * g++-4.5-multilib  # seed it directly until changing the defaults
+ * gfortran-4.5
+ * cpp-4.5-doc
+ * gcc-4.5-doc
+ * g++-4.5-doc

=== added file 'dvd'
--- dvd	1970-01-01 00:00:00 +0000
+++ dvd	2011-01-10 23:16:58 +0000
@@ -0,0 +1,229 @@
+= Hardware =
+
+
+== Graphics ==
+
+ * nvidia-current
+ * nvidia-glx-173
+ * nvidia-glx-96
+ * fglrx
+
+== Wireless ==
+ * bcmwl-kernel-source #since we no longer have LRM
+
+= Standards =
+
+ * lsb
+
+= Development =
+
+== Development Tools ==
+
+ * ant
+ * ocaml-native-compilers  # we support the source package anyway
+ * pymacs                 # makes bicyclerepair work with emacs
+ * libpurple-bin	# no particular reason to keep this single binary in universe
+ * quilt		# build-deps used to be pulled in automatically, now seed this directly
+
+== Mono ==
+
+ * mono-devel
+ * mono-jay
+ * mono-classlib-1.0
+ * libmono-sqlite1.0-cil
+
+== OpenOffice.org ==
+
+ * openoffice.org-officebean
+ * openoffice.org-help-br
+ * openoffice.org-l10n-br
+ * libxsltc-java
+
+= Desktop =
+
+ * xchat-gnome
+ * thunderbird # world favourite mail client
+ * nautilus-gksu
+ * abrowser
+
+ * openoffice.org-filter-binfilter
+ * openoffice.org-style-andromeda
+ * openoffice.org-style-default
+ * openoffice.org-style-industrial
+ * openoffice.org-style-tango
+ * gnome-accessibility-themes-extras
+
+ * icedtea-plugin
+
+ * seahorse-plugins
+ * gimp
+
+Other:
+
+ * devhelp
+ * dia-gnome           # useful but a bit specialist
+ * finger
+ * gftp-gtk
+ * glade-gnome-3
+ * memprof
+ * xnest
+ * xrestop
+ * unclutter           # super useful for anti-mouse freaks
+ * inkscape            # SVG drawing application
+ * screem                  # MRS, our default html editor
+ * vim-gnome
+ * vim-tiny
+ * vorbis-tools
+ * vorbisgain
+ * enscript
+ * bbdb
+ * auctex
+ * lbdb
+ * dictd
+ * dict-gcide
+ * dict-moby-thesaurus
+ * dict-foldoc
+ * dict-jargon
+ * dict-vera
+ * sabayon            # desktop profile management
+ * tomboy
+ * liferea
+ * gkbd-capplet      # we need to support the source anyway
+ * gvfs-bin
+ * virt-manager
+ * python-virtinst
+ * python-gtk-vnc
+ * python-urlgrabber
+
+= Console Tools =
+
+ * freecdb
+ * dict
+ * wdiff
+ * xml-twig-tools  # we need libxml-twig-perl as build dep anyway, so we can as well support this binary
+ * bittornado             # used on the servers.
+
+= Documentation =
+
+We need a consistent policy for -doc. At the least, any -doc package produced by a source package that also generates a binary package in one of our seed lists should absolutely go into supported.
+
+ * doc-linux-html          # ColinWatson; basic HOWTOs and stuff from LDP
+ * manpages-dev            # ColinWatson
+ * ubuntu-faqguide
+ * monodoc
+ * monodoc-browser
+ * diveintopython
+ * diveintopython-zh
+ * autoconf-doc
+ * automake1.8-doc
+ * automake1.9-doc
+ * automake1.10-doc
+ * packaging-guide
+ * %texlive-doc
+ * texlive-font-utils
+ * texlive-bibtex-extra
+ * texlive-fonts-extra
+ * texlive-publishers
+ * texlive-science
+
+ * gimp-manual
+ * gimp-help-en
+ * gimp-help-de
+ * gimp-help-sv
+ * gimp-help-fr
+ * gfortran-doc
+ * doc-linux-text
+ * gimp-helpbrowser
+ * exim4-doc-html
+ * libstdc++6-4.4-doc
+
+These *-doc packages are in separate source packages, so Extra-Includes won't catch them and they need to be listed explicitly.
+
+ * automake1.8-doc
+ * automake1.9-doc
+ * bison-doc
+ * diff-doc
+ * gawk-doc
+ * gdb-doc
+ * glibc-doc-reference
+ * gnupg-doc
+ * make-doc
+ * python-gtk2-doc
+ * python-gtk2-tutorial
+ * scribus-doc
+ * tar-doc
+
+== Multimedia ==
+
+ * flac
+ * esound-clients
+ * eyed3			# we need to support the source anyway, harmless tool
+
+= Database =
+
+ * libqt3c102-mt-mysql
+ * libqt3c102-mt-psql
+
+= Localisation =
+
+ * gettext-el
+ * myspell-de-de-oldspell # non-default alternative for language-support-de
+ * myspell-fr # myspell-fr-gut preferred
+ * ttf-alee
+ * ttf-unfonts-core
+ * ttf-unfonts-extra
+ * ttf-arphic-bkai00mp
+ * ttf-arphic-bsmi00lp
+ * ttf-arphic-gbsn00lp
+ * ttf-arphic-gkai00mp
+ * ttf-malayalam-fonts
+ * ttf-devanagari-fonts
+ * ttf-tamil-fonts
+ * ttf-oriya-fonts
+ * ttf-kannada-fonts
+ * ttf-bengali-fonts
+ * ttf-indic-fonts
+ * ttf-indic-fonts-core
+ * ttf-telugu-fonts
+ * ttf-punjabi-fonts
+ * ttf-gujarati-fonts
+ * nabi
+ * imhangul
+ * culmus
+ * %texlive-lang
+ * openoffice.org-help-en-gb
+ * openoffice.org-l10n-en-gb
+ * openoffice.org-l10n-in	# dependency package for Indian locales
+ * openoffice.org-l10n-za	# dependency package for South African locales
+
+= Transitional packages =
+
+It's useful to have these on the DVD so that it can be used as an
+apt source for upgrades.
+
+ * ec2-init
+
+= Miscellaneous =
+
+ * miscfiles
+
+= Germinate workarounds =
+
+= Not quite ready for the default install yet =
+
+= Language packs =
+
+The complete set is in the DVD live image (dvd-live). We do not have
+the space to include the entire set of .debs all over again here, so
+let's just pick a few common ones
+
+ * Languages: en es xh pt de fr
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+ * language-support-${Languages}
+
+== Blacklist ==
+
+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
+
+ * !libavcodec*

=== added file 'dvd-live'
--- dvd-live	1970-01-01 00:00:00 +0000
+++ dvd-live	2011-01-10 23:16:58 +0000
@@ -0,0 +1,28 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu live DVD
+Task-Extended-Description: This task provides the extra packages installed on the Ubuntu live DVD, above and beyond those included on the Ubuntu live CD. It is neither useful nor recommended to install this task in other environments.
+Task-Relevance: 2
+Task-Key: language-pack-aa
+Task-Test-new-install: skip show
+
+= Language packs; in theory we're putting them all on the DVD =
+ * /^language-pack-[^-]+$/
+ * /^language-pack-gnome-[^-]+$/
+ * /^language-support-[^-]+$/
+
+= Input methods =
+# currently not otherwise seeded on the desktop, but according to
+# doc/langpacks.txt they should be for their corresponding languages
+ * ibus-chewing
+ * ibus-hangul
+ * ibus-anthy
+ * ibus-table-cangjie
+ * ibus-table-erbi
+ * ibus-table-extraphrase
+ * ibus-table-wubi
+ * ibus-table-yong
+
+= Desktop =
+
+ * icedtea-plugin

=== added file 'eucalyptus-cloud'
--- eucalyptus-cloud	1970-01-01 00:00:00 +0000
+++ eucalyptus-cloud	2011-01-10 23:16:58 +0000
@@ -0,0 +1,9 @@
+Task-Section: server
+Task-Description: Cloud computing: top-level cloud controller
+Task-Extended-Description: Eucalyptus cloud controller.
+Task-Key: eucalyptus-cloud
+Task-Test-new-install: skip show
+
+ * eucalyptus-cloud [amd64 i386]
+ * avahi-daemon [amd64 i386]
+ * euca2ools [amd64 i386]

=== added file 'eucalyptus-cluster'
--- eucalyptus-cluster	1970-01-01 00:00:00 +0000
+++ eucalyptus-cluster	2011-01-10 23:16:58 +0000
@@ -0,0 +1,10 @@
+Task-Section: server
+Task-Description: Cloud computing: cluster controller
+Task-Extended-Description: Eucalyptus cluster controller.
+Task-Key: eucalyptus-cc
+Task-Test-new-install: skip show
+
+ * eucalyptus-cc [amd64 i386]
+ * bridge-utils [amd64 i386]
+ * avahi-daemon [amd64 i386]
+ * euca2ools [amd64 i386]

=== added file 'eucalyptus-node'
--- eucalyptus-node	1970-01-01 00:00:00 +0000
+++ eucalyptus-node	2011-01-10 23:16:58 +0000
@@ -0,0 +1,12 @@
+Task-Section: server
+Task-Description: Cloud computing: node controller
+Task-Extended-Description: Eucalyptus node controller.
+Task-Key: eucalyptus-nc
+Task-Test-new-install: skip show
+
+ * eucalyptus-nc [amd64 i386]
+ * ubuntu-virt-server [amd64 i386]
+ * bridge-utils [amd64 i386]
+ * aoetools [amd64 i386]
+ * avahi-daemon [amd64 i386]
+ * euca2ools [amd64 i386]

=== added file 'eucalyptus-simple-cluster'
--- eucalyptus-simple-cluster	1970-01-01 00:00:00 +0000
+++ eucalyptus-simple-cluster	2011-01-10 23:16:58 +0000
@@ -0,0 +1,13 @@
+Task-Section: server
+Task-Description: Cloud computing: all-in-one cluster
+Task-Extended-Description: Combined Eucalyptus cloud and cluster controllers.
+Task-Key: eucalyptus-cc
+Task-Test-new-install: skip show
+
+ * eucalyptus-cloud [amd64 i386]
+ * eucalyptus-walrus [amd64 i386]
+ * eucalyptus-cc [amd64 i386]
+ * eucalyptus-sc [amd64 i386]
+ * bridge-utils [amd64 i386]
+ * avahi-daemon [amd64 i386]
+ * euca2ools [amd64 i386]

=== added file 'eucalyptus-storage'
--- eucalyptus-storage	1970-01-01 00:00:00 +0000
+++ eucalyptus-storage	2011-01-10 23:16:58 +0000
@@ -0,0 +1,10 @@
+Task-Section: server
+Task-Description: Cloud computing: storage controller
+Task-Extended-Description: Eucalyptus storage controller.
+Task-Key: eucalyptus-sc
+Task-Test-new-install: skip show
+
+ * eucalyptus-sc [amd64 i386]
+ * aoetools [amd64 i386]
+ * avahi-daemon [amd64 i386]
+ * euca2ools [amd64 i386]

=== added file 'eucalyptus-walrus'
--- eucalyptus-walrus	1970-01-01 00:00:00 +0000
+++ eucalyptus-walrus	2011-01-10 23:16:58 +0000
@@ -0,0 +1,9 @@
+Task-Section: server
+Task-Description: Cloud computing: Walrus storage service
+Task-Extended-Description: Eucalyptus Walrus controller.
+Task-Key: eucalyptus-walrus
+Task-Test-new-install: skip show
+
+ * eucalyptus-walrus [amd64 i386]
+ * avahi-daemon [amd64 i386]
+ * euca2ools [amd64 i386]

=== renamed file 'installer' => 'installer.THIS'
=== added file 'live.OTHER'
--- live.OTHER	1970-01-01 00:00:00 +0000
+++ live.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,39 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu live CD
+Task-Extended-Description: This task provides the extra packages installed on the Ubuntu live CD. It is neither useful nor recommended to install this task in other environments.
+Task-Relevance: 2
+Task-Key: ubiquity-frontend-gtk
+Task-Test-new-install: skip show
+Task-Seeds: live-common
+
+ * Languages: en
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+ * language-support-${Languages}
+
+ * Languages: es xh pt
+ * language-pack-${Languages} [!powerpc]
+ * language-pack-gnome-${Languages} [!powerpc]
+
+Enough room on i386, not enough on amd64:
+ * Languages: de fr bn zh-hans
+ * language-pack-${Languages} [i386]
+ * language-pack-gnome-${Languages} [i386]
+
+We should have enough space to include all langpacks on the 1 GB armel desktop
+live images:
+ * /^language-pack-[^-]+$/ [armel]
+ * /^language-pack-gnome-[^-]+$/ [armel]
+
+ * gparted
+ * cifs-utils # Needed by casper for CIFS root=
+
+== Ubiquity components ==
+
+These packages make up the Ubiquity live installer.
+
+ * ubiquity-frontend-gtk
+ * ubiquity-ubuntu-artwork
+ * ubiquity-slideshow-ubuntu
+ * python-webkit # Needed by ubiquity-frontend-gtk for ubiquity-slideshow.

=== added file 'mail-server.OTHER'
--- mail-server.OTHER	1970-01-01 00:00:00 +0000
+++ mail-server.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,14 @@
+Task-Section: server
+Task-Description: Mail server
+Task-Extended-Description: This task selects a variety of package useful for a general purpose mail
+Task-Extended-Description: server system.
+Task-Key: postfix
+ 
+ * postfix
+ * dovecot-pop3d
+ * dovecot-imapd
+ * bsd-mailx
+ * mutt
+ * procmail
+
+Additionally, Debian has mailagent, but that's in universe and not an option.

=== renamed file 'minimal' => 'minimal.THIS'
=== added file 'openssh-server.OTHER'
--- openssh-server.OTHER	1970-01-01 00:00:00 +0000
+++ openssh-server.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,7 @@
+Task-Section: server
+Task-Description: OpenSSH server
+Task-Extended-Description: Selects packages needed for an OpenSSH server.
+Task-Relevance: 7
+Task-Key: openssh-server
+
+ * openssh-server

=== added file 'print-server.OTHER'
--- print-server.OTHER	1970-01-01 00:00:00 +0000
+++ print-server.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,12 @@
+Task-Section: server
+Task-Description: Print server
+Task-Extended-Description: This task sets up your system to be a print server.
+Task-Key: cups, cups-bsd, cups-client
+
+ * cups
+ * cups-bsd
+ * cups-client
+ * cups-driver-gutenprint
+ * foomatic-db-compressed-ppds
+ * hpijs
+ * openprinting-ppds

=== renamed file 'required' => 'required.THIS'
=== added file 'samba-server.OTHER'
--- samba-server.OTHER	1970-01-01 00:00:00 +0000
+++ samba-server.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,12 @@
+Task-Section: server
+Task-Description: Samba file server
+Task-Extended-Description: This task sets up your system to be a Samba file server, which is 
+Task-Extended-Description: especially suitable in networks with both Windows and Linux systems.
+Task-Key: samba
+
+ * libpam-smbpass
+ * samba
+ * samba-doc
+ * smbclient
+ * smbfs
+ * winbind

=== added file 'server'
--- server	1970-01-01 00:00:00 +0000
+++ server	2011-01-10 23:16:58 +0000
@@ -0,0 +1,26 @@
+Task-Section: server
+Task-Description: Basic Ubuntu server
+Task-Extended-Description: This task provides the Ubuntu server environment.
+Task-Relevance: 8
+Task-Key: screen
+
+This seed lists the packages we want to install by default in the new server install.
+
+= System administration tools =
+
+ * patch
+ * screen
+ * byobu
+ * landscape-common
+ * vim
+ * apport # LP: #424051
+
+= Network =
+
+ * wireless-tools
+ * wpasupplicant  # ScottJamesRemnant
+
+= Documentation =
+
+ * w3m
+ * ubuntu-serverguide

=== added file 'server-ship.OTHER'
--- server-ship.OTHER	1970-01-01 00:00:00 +0000
+++ server-ship.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,333 @@
+= Kernel =
+
+We seed both linux-* and linux-image-* so that it's easier to build CD
+images without the restricted component. The linux-* kernels include
+restricted modules.
+
+ * Kernel-Stem: linux linux-image
+
+== i386 ==
+
+ * ${Kernel-Stem}-generic-pae [i386]
+ * linux-headers-generic-pae [i386]
+ * ${Kernel-Stem}-virtual [i386]
+ * linux-headers-virtual [i386]
+
+== powerpc ==
+
+ * ${Kernel-Stem}-powerpc-smp [powerpc]
+ * linux-headers-powerpc-smp [powerpc]
+
+== amd64 ==
+
+ * ${Kernel-Stem}-server [amd64]
+ * linux-headers-server [amd64]
+ * ${Kernel-Stem}-virtual [amd64]
+ * linux-headers-virtual [amd64]
+
+= From Ship =
+
+ * ssh
+ * lsb-core
+ * lsb-cxx
+ * ntp
+ * bsd-mailx
+ * mutt
+ * build-essential
+ * fakeroot
+ * devscripts
+ * setserial
+
+= Cluster =
+
+ * redhat-cluster-suite
+ * ocfs2-tools
+ * libaio1
+ * libaio-dev
+ * ipvsadm
+ * keepalived
+ * gnbd-client
+ * gnbd-server
+ * multipath-tools
+
+= Servers and Daemons =
+
+Database:
+
+ * mysql-client
+ * mysql-server
+ * postgresql
+ * postgresql-client
+ * postgresql-doc
+
+Proxy:
+
+ * squid # RobertCollins
+
+LDAP:
+
+ * slapd
+ * ldap-utils
+ * ldap-auth-client	# metapackage that pulls in lib{pam,nss}-ldap and configuration magic
+
+Web:
+
+ * apache2
+ * apache2-doc
+ * apache2-mpm-event
+ * apache2-mpm-prefork
+ * apache2-mpm-worker
+ * apache2-utils
+ * libapache2-mod-auth-mysql # FabioMassimoDiNitto
+ * libapache2-mod-auth-pgsql # FabioMassimoDiNitto
+ * libapache2-mod-macro      # FabioMassimoDiNitto
+ * libapache2-mod-perl2 # python is in supported
+ * libapache2-mod-python        #ThomMay
+ * libapache2-mod-python-doc    #ThomMay
+ * libapache2-mod-auth-plain     # FabioMassimoDiNitto
+ * libapache2-mod-security       # FabioMassimoDiNitto
+ * libapache-mod-auth-kerb	 # ChuckShort
+
+PHP:
+
+ * libapache2-mod-php5
+ * php-pear
+ * php5-cgi
+ * php5-cli
+ * php5-curl
+ * php5-gd
+ * php5-gmp
+ * php5-ldap
+ * php5-mhash
+ * php5-mysql
+ * php5-odbc
+ * php5-pgsql
+ * php5-pspell
+ * php5-recode
+ * php5-snmp
+ * php5-sqlite
+ * php5-tidy
+ * php5-xmlrpc
+ * php5-xsl
+ * php5
+
+Email:
+
+ * dovecot-imapd
+ * dovecot-pop3d
+ * dovecot
+ * postfix-cdb
+ * postfix-doc
+ * postfix-ldap
+ * postfix-mysql
+ * postfix-pcre
+ * postfix-pgsql
+ * postfix
+ * amavisd-new		      # ChuckShort
+ * spamassassin		      # Scott Kitterman
+ * clamav		      # Scott Kitterman
+ * clamav-daemon	      # Scott Kitterman
+
+Must also consider webmail and so on...
+
+FTP/TFTP:
+
+ * vsftpd # a secure ftpd
+ * tftpd-hpa # The one from OpenBSD which supports PXE
+ * tftp-hpa # client
+
+Printing:
+ * cups                       # our preferred printer management infrastructure
+ * cups-bsd                   # gives us lpc, lpq, lpr, lprm
+ * cups-client                # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
+ * foomatic-db-compressed-ppds  # the foomatic printer driver database
+ * foomatic-filters             # converter from postscript to printer-specific formats
+ * openprinting-ppds
+ * cups-driver-gutenprint     # a ton of cupsys ppds, for real comprehensive printer support
+ * pnm2ppa                      # several ppds require this
+ * ghostscript                  # some ppds require this
+
+Other:
+
+ * isc-dhcp-server
+ * snmp
+ * snmpd
+ * openbsd-inetd
+ * nbd-server
+ * open-iscsi # ChuckShort
+ * open-iscsi-udeb # SorenHansen
+ * drbd8-utils # ChuckShort - ServerPackageReview
+ * nut # ChuckShort - ServerPackageReview
+ * nut-cgi
+ * nut-snmp
+ * openvpn #ChuckShort - ServerPackageReview
+ * netcat-openbsd
+ * munin-node
+ * munin-plugins-contrib
+ * munin
+ * openssh-blacklist-extra
+ * openssl-blacklist-extra
+ * openvpn-blacklist
+ * bacula # ChuckShort - SRP
+ * bacula-common # ChuckShort - SRP
+ * bacula-director-common # ChuckShort - SRP
+ * bacula-director-mysql # ChuckShort - SRP
+ * bacula-director-pgsql # ChuckShort - SRP
+ * bacula-client # ChuckShort - SRP
+ * bacula-fd # ChuckShort - SRP
+ * bacula-server # ChuckShort - SRP
+ * bacula-sd # ChuckShort - SRP
+ * bacula-sd-mysql # ChuckShort - SRP
+ * bacula-sd-pgsql # ChuckShort - SRP
+ * bacula-console # ChuckShort - SRP
+ * likewise-open
+ * libpkcs11-helper1
+ * tomcat6
+ * tomcat6-user
+ * tomcat6-admin
+ * tomcat6-examples
+ * tomcat6-docs
+ * tomcat6-common
+ * libtomcat6-java
+ * libservlet2.5-java
+ * libcommons-dbcp-java
+ * libcommons-collections-java
+ * libcommons-pool-java
+ * jsvc
+ * libcommons-daemon-java
+ * zip #ChuckShort - server-lucid-seeds
+ * unzip #ChuckShort - server-lucid-seeds
+ * python-svn #ChuckShort - server-lucid-canonical-application-support
+ * tdb-tools #ChuckShort - server-lucid-seeds
+ * acl #ChuckShort - server-lucid-seeds
+
+Application Servers:
+
+ * mailman
+
+RCS:
+
+ * cvs
+ * bzr
+
+Utilities:
+
+ * pm-utils
+ * pciutils		  # kirkland added at the request of onsite hardware enablement (manjo)
+
+= Network =
+
+ * nmap                   # network diagnostics
+ * dnstracer              # dns network diagnostics
+ * iptraf                 # sysadmin's toy, may be a candidate for removal
+ * pptpd                  # server that allows setup of Microsoft-compatible VPN
+ * ifenslave-2.6          # interface bonding/trunking/etherchannel
+ * ipsec-tools            # IPsec configuration
+ * vlan                   # userland tools to config 8021q support
+ * vlan-udeb              # userland tools to support 8021q from the installer
+ * bridge-utils           # userland tools to config kernel bridging feature
+ * wakeonlan              # sends magic packet to wake sleeping servers
+ * ethtool                # needed to enable a server to wakeonlan
+ * iputils-arping         # would have made elmo's life easier at debconf 4
+
+IPv6 tools:
+
+ * radvd                  # FabioMassimoDiNitto
+ * quagga                 # RobertCollins
+
+Security:
+
+ * checksecurity          # JamesTroup, from Hoglet
+ * aide                   # JamesTroup, from Hoglet
+
+= Shells =
+
+ * zsh
+
+= System Administration Tools =
+
+ * attr                 # will move to base if we go to selinux
+ * quota
+ * backuppc             # RobertCollins
+ * debian-goodies
+ * whois                # FabioMassimoDiNitto
+ * cu                   # super-basic serial access
+ * libpam-cracklib      # enables weak password checking during password change, should it be in desktop?
+ * libpam-krb5		# ChuckShort
+ * libpam-mount	        # ChuckShort
+ * libpam-p11		# ChuckShort
+ * libpam-radius-auth   # ChuckShort
+ * pam-p11		# ChuckShort
+ * chkrootkit           # forensic detection of rootkit
+ * xinetd               # JamesTroup, from hoglet
+ * libcap-bin
+ * libpam-opie
+ * opie-client
+ * opie-server
+ * sasl2-bin
+ * autofs5
+ * awstats
+ * acct
+ * authbind                     # BIGGER SECURITAH REVIEW
+ * siege
+ * smartmontools   # hard disk diagnostics
+ * mtx		   # ChuckShort - ServerPackageReview
+ * logwatch	   # ChuckShort - ServerPackageReview
+ * lsscsi	# ChuckShort
+ * vblade	# ChuckShort
+ * sysstat	# ChuckShort - ServerPackageReview
+ * openipmi     # ChuckShort - ServerPackageReview
+ * munin	# ChuckShort - ServerPackageReview
+ * munin-plugins-contrib    # ChuckShort - ServerPackageReview
+ * munin-node # ChuckShort - ServerPackageReview
+ * dbconfig-common	# ChuckShort - calendaring spec.
+ * unattended-upgrades
+ * update-motd # RickClark
+ * landscape-client # RickClark
+ * computer-janitor
+ * puppet # ChuckShort
+ * puppetmaster # Chuck Short
+ * facter # Chuck Short
+ * fortunes-ubuntu-server
+ * etckeeper
+
+= Virtualisation =
+
+ * kvm
+ * python-libvirt
+ * python-urlgrabber
+ * libvirt-bin
+
+= Documentation =
+
+ * ubuntu-serverguide
+
+== Miscellaneous ==
+
+ * miscfiles
+ * checkbox-cli # MathiasGug
+ * apport # MathiasGug
+ * kerneloops-daemon # JamesWestby
+ * python-beautifulsoup #ChuckShort
+ * python-genshi #ChuckShort
+
+
+= From desktop =
+
+ * bc
+ * screen
+ * lftp
+ * zip
+ * unzip                # also used for .zip support in file-roller
+
+= Installer =
+
+ * oem-config-debconf
+ * partman-iscsi
+ * eucalyptus-udeb
+
+== Blacklist ==
+
+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
+
+ * !libavcodec*

=== added file 'ship-live.OTHER'
--- ship-live.OTHER	1970-01-01 00:00:00 +0000
+++ ship-live.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,43 @@
+The ship-live seed will be added to the live CD as an ordinary package
+archive. Here belongs anything that somebody might need to install after
+installing the contents of the live CD in order to get online and fetch more
+packages.
+
+== Development ==
+
+These packages are needed in order to build Ubuntu packages.
+
+ * build-essential
+ * fakeroot
+
+== Hardware & Network Access ==
+
+ * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
+ * sl-modem-daemon	# needed for some Winmodems (see OutoftheboxWinmodem)
+ * bpalogin
+ * ndiswrapper-utils-1.9 [amd64 i386]
+ * ndisgtk
+
+ * linux-wlan-ng
+ * libatm1	# suggested by ppp for PPP-over-ATM
+ * setserial	# needed by folks with nonstandard serial ports
+ * mouseemu	# needed on Macs with single-button mice
+ * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems
+ * elfspe2 [powerpc] # SPE access for Cell systems
+ * b43-fwcutter
+ * bcmwl-kernel-source #since we no longer have LRM
+ * wvdial       # network-manager should replace this functionality ASAP
+
+== Installer ==
+
+ * grub # needed for dmraid et al
+ * grub-efi [amd64]
+ * oem-config-gtk
+ * lupin-support [amd64 i386] # installer-for-windows
+ * uboot-mkimage [armel] # needed on dove for uboot
+
+== Blacklist ==
+
+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
+
+ * !libavcodec*

=== renamed file 'standard' => 'standard.THIS'
=== added file 'supported-desktop-extra'
--- supported-desktop-extra	1970-01-01 00:00:00 +0000
+++ supported-desktop-extra	2011-01-10 23:16:58 +0000
@@ -0,0 +1,27 @@
+This seed exists only to allow fine tuning the 3y support time
+
+= Dev tools =
+
+ * cdbs
+ * gnupg2
+
+= Additional multimedia =
+
+ * cheese
+ * ffmpeg
+ * gstreamer-tools
+
+= Nvidia =
+
+ * nvidia-180-libvdpau
+ * nvidia-185-libvdpau
+ * nvidia-185-modaliases
+ * nvidia-kernel-common
+
+= Extra desktop =
+
+ * openoffice.org-base
+ * openoffice.org-evolution
+ * pidgin
+ * scrollkeeper
+ * thunderbird-gnome-support

=== added file 'supported.OTHER'
--- supported.OTHER	1970-01-01 00:00:00 +0000
+++ supported.OTHER	2011-01-10 23:16:58 +0000
@@ -0,0 +1,112 @@
+Most of what was formerly in the supported seed is now in the dvd seed. This
+seed now includes some things that are too big for a DVD, and of course also
+inherits from everything else.
+
+= Language support =
+
+The following packages also have application translations, but are not
+using gettext, but a custom format. language-selector will install
+them as appropriate.
+
+ * /^gimp-help-/
+ * /^evolution-documentation-/
+ * /^openoffice.org-help-/
+ * /^openoffice.org-l10n-/
+ * /^thunderbird-locale-/
+ * poppler-data
+
+The following input aids are also installed on demand by
+language-selector:
+
+ * mozvoikko
+ * openoffice.org-voikko
+ * /^gnome-user-guide-/
+ * /^openoffice.org-thesaurus-/
+ * /^openoffice.org-hyphenation/
+
+Transitional packages for the -zh split, to be kept until after the
+next LTS after 8.04 (most likely karmic+1):
+
+ * language-pack-gnome-zh-base
+ * language-pack-kde-zh-base
+ * language-pack-zh-base
+ * language-support-fonts-zh
+ * language-support-input-zh
+
+= Transitional packages for clean upgrades =
+
+ * nvidia-185-modaliases # drop in lucid+1
+
+= Rescued from Extra =
+
+ * Extra-Include: *-dbg *-debug *-dev *-doc *-docs *-gcj
+
+... and some miscellaneous exclusions for things we don't want to drag in
+automatically (note that Extra-Exclude *only* prevents packages from being
+included due to matching Extra-Include patterns, and has no other effect):
+
+ * Extra-Exclude: libstdc++6-doc libstdc++6-dev libstdc++6-dbg lib*stdc++6-4.1* lib*stdc++6-4.2* lib*stdc++6-4.3*
+ * Extra-Exclude: libgnat*-dev libgnat*-dbg gnat*-doc
+ * Extra-Exclude: gpc*-doc
+ * Extra-Exclude: lib*mudflap*
+ * Extra-Exclude: gfortran-4.1-doc gfortran-4.2-doc gfortran-4.3-doc lib*gfortran1-dbg
+ * Extra-Exclude: lib*objc1-dbg
+ * Extra-Exclude: libavformat-dev libpostproc-dev
+ * Extra-Exclude: libgdchart-gd2-xpm-dev
+ * Extra-Exclude: libgdome2-ocaml-dev
+ * Extra-Exclude: libmpich-mpd1.0-dev libmpich-shmem1.0-dev
+ * Extra-Exclude: libnetpbm9-dev
+ * Extra-Exclude: libavahi-compat-howl-dev
+ * Extra-Exclude: libboost-*-dev
+ * Extra-Exclude: libcairo-directfb2-dev
+ * Extra-Exclude: libcdio-*-dev libiso9660-dev
+ * Extra-Exclude: libxaw6*		# built from the same source as libxaw7*
+ * Extra-Exclude: nvidia-glx-legacy-dev # nvidia-glx-legacy is unsupportable
+ * Extra-Exclude: python-qt3-gl-dbg # We don't want python-qt3-gl in main
+ * Extra-Exclude: python-qt4-gl python-qt4-gl-dbg # We don't want python-qt4-gl in main
+ * Extra-Exclude: g77-doc # pulls in gcc-3.4
+ * Extra-Exclude: libkiten-dev
+ * Extra-Exclude: sendmail-doc
+ * Extra-Exclude: mono-dbg # only useful with mono-debugger, currently in universe
+ * Extra-Exclude: python-renderpm-dbg
+ * Extra-Exclude: python-reportlab-accel-dbg # packages aren't in main, -dbg shouldn't cause them to be
+ * Extra-Exclude: libnewlib-dev # not used in main, we only want newlib-spu for powerpc
+ * Extra-Exclude: sendmail-doc # sendmail source is only in main for libmilter
+ * Extra-Exclude: libgnumail-java-doc # depends on classpath
+ * Extra-Exclude: libcommons-dbcp-java-doc # depends on classpath
+ * Extra-Exclude: javacc-doc # depends on classpath
+ * Extra-Exclude: virtuoso-vad-doc # depends on binaries that were not MIR-approved
+ * Extra-Exclude: libgl1-mesa-dri-experimental-dbg # LP: #638097
+
+
+Transitional packages:
+
+ * Extra-Exclude: atm-dev
+ * Extra-Exclude: mozilla-firefox-dev
+ * Extra-Exclude: xserver-xorg-video-amd-dbg
+
+Exclude some KDE-specific pieces:
+
+ * Extra-Exclude: kdebase-dbg
+ * Extra-Exclude: kdelibs-dbg
+ * Extra-Exclude: kdelibs4-doc
+ * Extra-Exclude: kdepim-dbg
+ * Extra-Exclude: kdesdk-dbg
+ * Extra-Exclude: libdbus-qt-1-dev
+ * Extra-Exclude: libdcop3-java-dev
+ * Extra-Exclude: libindex0-dev
+ * Extra-Exclude: libpoppler-qt-dev
+ * Extra-Exclude: libqt4-debug libqt4-debug-dev qt4-doc
+ * Extra-Exclude: libsmokekde-dev
+ * Extra-Exclude: python-kde3-dbg
+ * Extra-Exclude: python-qt3-dbg
+ * Extra-Exclude: python-qtext-dbg
+ * Extra-Exclude: qt-x11-free-dbg
+
+Temporary workarounds:
+
+ * openoffice.org-evolution # no rdepends any more, noticed too late
+
+= Build infrastructure =
+
+ * pkgbinarymangler # needs to be in main to stay in the buildd chroots

=== added file 'tomcat-server'
--- tomcat-server	1970-01-01 00:00:00 +0000
+++ tomcat-server	2011-01-10 23:16:58 +0000
@@ -0,0 +1,9 @@
+Task-Section: server
+Task-Description: Tomcat Java server
+Task-Extended-Description: Selects a ready-made Java Application server.
+Task-Key: tomcat6
+
+ * tomcat6
+ * tomcat6-examples
+ * tomcat6-docs
+ * tomcat6-admin

=== added file 'uec'
--- uec	1970-01-01 00:00:00 +0000
+++ uec	2011-01-10 23:16:58 +0000
@@ -0,0 +1,35 @@
+Task-Section: server
+Task-Description: Ubuntu Enterprise Cloud (instance)
+Task-Extended-Description: Packages included in UEC images.
+Task-Key: cloud-init
+
+= Libraries =
+
+See https://launchpad.net/bugs/427288 for why we need both of these (-i686 on UEC, -xen on EC2).
+
+ * libc6-i686 [i386]
+ * libc6-xen [i386]
+
+= System administration tools =
+
+ * patch
+ * byobu
+ * landscape-common
+ * vim
+ * apport # LP: #424051
+ * openssh-server
+ * curl
+ * tasksel # LP: #649833
+
+= Documentation =
+
+ * w3m
+ * ubuntu-serverguide
+
+= EC2 =
+
+ * cloud-init
+ * cloud-utils
+# * ec2-ami-tools
+ * euca2ools
+ * grub-legacy-ec2

=== added file 'uec-live'
--- uec-live	1970-01-01 00:00:00 +0000
+++ uec-live	2011-01-10 23:16:58 +0000
@@ -0,0 +1,113 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu Enterprise Cloud Live CD
+Task-Extended-Description: This task provides the UEC packages installed on the Ubuntu live CD. It is neither useful nor recommended to install this task in other environments.
+Task-Relevance: 2
+Task-Key: eucalyptus-simple-cluster
+Task-Test-new-install: skip show
+Task-Seeds: live-common
+
+# Drop all languages but english
+ * Languages: en
+
+# Add the UEC packages
+ * eucalyptus-simple-cluster
+ * eucalyptus-node
+ * uec
+
+# Add the necessary liveCD components, drop the rest
+ * (avahi-autoipd)     # IPv4 link-local interface configuration support
+ * (network-manager-gnome) # see NetworkRoaming spec
+ * (network-manager-pptp)
+ * (network-manager-pptp-gnome)
+ * xterm                         # Provide a backup terminal and complete X env.
+ * (im-switch)
+ * (ibus)
+ * (ibus-gtk)
+ * (ibus-table)
+ * (ibus-pinyin)
+ * (ibus-pinyin-db-android)
+ * (apport-gtk)
+ * desktop-file-utils
+ * eog
+ * file-roller
+ * gcalctool
+ * gconf-editor
+ * gdm
+ * (gdm-guest-session)
+ * gedit
+ * gnome-about
+ * gnome-applets
+ * software-center
+ * (app-install-data-partner)
+ * (gnome-codec-install)    # new default codec installation tool (from debian)
+ * gnome-control-center
+ * system-config-printer-gnome
+ * gnome-icon-theme
+ * gnome-media
+ * gnome-menus
+ * gnome-nettool            # part of 2.8
+ * gnome-panel
+ * gnome-session
+ * seahorse
+ * (libpam-gnome-keyring)
+ * gnome-system-monitor     # SebastienBacher
+ * gnome-power-manager		# OliverGrawert finally ready for shipment
+ * gnome-system-tools
+ * gnome-terminal
+ * gnome-utils
+ * (gnome-user-guide)
+ * gucharmap               # SebastienBacher
+ * checkbox-gtk
+ * language-selector	   # MichaelVogt
+ * metacity                # SebastienBacher
+ * (compiz) [i386 powerpc amd64]		   # compiz is our default WM 'mkay
+ * (firefox)
+ * (firefox-gnome-support)
+ * (ubufox)                # ubuntu firefox tweaks - AlexanderSack
+ * nautilus                # SebastienBacher
+ * nautilus-sendto
+ * (nautilus-share)
+ * rarian-compat
+ * alacarte		   # default menu editor
+ * ssh-askpass-gnome
+ * synaptic                # default GUI package manager
+ * software-properties-gtk # default GUI sources.list editor
+ * update-manager
+ * update-notifier
+ * gdebi                   # view/install deb packages
+ * yelp
+ * zenity
+ * (xdg-utils)		   # useful utilities
+ * xdg-user-dirs
+ * xdg-user-dirs-gtk
+ * pulseaudio-esound-compat
+ * pulseaudio
+ * (pulseaudio-module-gconf)
+ * (pulseaudio-module-x11)
+ * (pulseaudio-module-bluetooth)
+ * (gvfs-fuse)			# let non-GNOME apps see GVFS via fuse
+ * launchpad-integration	# Needed to show the launchpad menu items
+ * (gnome-disk-utility)
+ * gnome-themes-selected
+ * gnome-themes-ubuntu
+ * gtk2-engines			# DanielHolbach (gtk2-engines were merged into one package)
+ * gtk2-engines-pixbuf          # Required by some themes the user might install
+ * ubuntu-artwork
+ * ubuntu-sounds
+ * gnome-session-canberra	# Needed to make login/logout sounds audible.
+ * libsdl1.2debian # tiny and needed for clean CDROM upgrades
+ * libsdl1.2debian-pulseaudio
+ * evince
+ * (gnome-screensaver) # recommends to allow for xscreensaver to be used
+ * xscreensaver-gl # MRS, we will only ship a subset of the screensavers from rss-glx and xscreensaver
+ * xscreensaver-data # subset package for the non-gl screensavers we ship
+ * screensaver-default-images
+ * (jockey-gtk) # enable non-free graphics and other drivers easily
+ * (usb-creator-gtk) [i386 amd64]
+ * (gcc)
+ * (make)
+ * (linux-headers-generic) [i386]
+ * (linux-headers-generic) [amd64]
+ * (linux-headers-dove) [armel]
+ * (plymouth-theme-ubuntu-logo)

=== added file 'virt-host'
--- virt-host	1970-01-01 00:00:00 +0000
+++ virt-host	2011-01-10 23:16:58 +0000
@@ -0,0 +1,10 @@
+Task-Section: server
+Task-Description: Virtual Machine host
+Task-Extended-Description: Packages necessary to host virtual machines
+Task-Metapackage: ubuntu-virt-server
+Task-Key: ubuntu-virt-server
+
+ * ubuntu-virt-server
+ * kvm
+ * libvirt-bin
+ * openssh-server