Merge ~ubuntukylin-members/ubuntu-seeds/+git/ubuntukylin:drop-mouseemu into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:groovy

[Steve Langasek]

Tracks the change from https://code.launchpad.net/~vorlon/ubuntu-seeds/+git/ubuntu/+merge/383532 on Ubuntu Desktop; the mouseemu package has been dropped from Debian, so we probably want to drop it from Ubuntu as well.

[Steve Langasek (vorlon)]

(targeted wrong branch; change has been properly merged)

Unmerged commits

cd15004... by Steve Langasek on 2020-10-09

drop mouseemu, following Ubuntu

2e95a03... by handsome_feng on 2020-09-22

Add desktop.minimal-remove

648ff43... by handsome_feng on 2020-09-21

Ship nvidia drivers and amd64-microcode in the live pool

0255bf0... by Olivier Tilloy on 2020-09-16

Replace gvfs-bin (being removed in groovy) by libglib2.0-bin (for `gio open`).

98b551f... by handsome_feng on 2020-08-11

Drop fcitx-ui-qimpanel, baobab and gnome-system-log

5db513d... by handsome_feng on 2020-08-11

Drop grub and grub-efi [amd64]; add shim-signed [amd64]; add zsys

7a6def7... by Łukasz Zemczak on 2020-04-24

platform.focal -> platform.groovy

9003c28... by handsome_feng on 2020-04-04

Add qt5-ukui-platformtheme to desktop recommend; format the zfs stuff in live

725615a... by handsome_feng on 2020-03-12

Drop fcitx-pinyin, fcitx-table-wubi since we have googlepinyin; drop chromium since we have firefox

d67eb21... by handsome_feng on 2020-02-28

Add zfs support

diff --git a/STRUCTURE b/STRUCTURE
index 22cc1c0..0d31d14 100644
--- a/STRUCTURE
+++ b/STRUCTURE
@@ -1,3 +1,4 @@
+<<<<<<< STRUCTURE
 feature follow-recommends
 feature no-follow-build-depends
 required:
@@ -34,3 +35,11 @@ supported-sysadmin-server: standard
 supported-server: supported-misc-servers supported-hardware-common supported-hardware-server supported-installer-common supported-installer-server supported-network-common supported-sysadmin-common supported-sysadmin-server build-essential supported-development-common supported-kernel-common supported-cloud supported-maas supported-landscape supported-openstack
 supported-desktop: supported-hardware-desktop supported-installer-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.groovy
+desktop: desktop-common
+live: desktop live-common
+ship-live: boot live
+# make sure supported remains the last entry
+supported: desktop ship-live supported-common language-packs
+>>>>>>> STRUCTURE
diff --git a/blacklist b/blacklist
 new file mode 100644
index 0000000..7812dd4
--- /dev/null
+++ b/blacklist
@@ -0,0 +1,71 @@
+<<<<<<< blacklist
+=======
+# blacklist: gnome1
+# We want to avoid shipping GNOME 1.x components if possible
+gconf
+libxml
+libcapplet
+gnome-bin
+gnome-libs
+
+# blacklist: unity
+# We don't use unity, and use ukui-greeter
+unity-greeter
+unity-control-center
+
+# blacklist: misc
+# Packages which are pulled in incidentally (typically by build-dependencies)
+# and could be trivially replaced with something that we ship
+
+# java-common build-depends
+#dpsyco
+# various build-depends, pulls in lua, consider standarizing html->text
+#elinks
+# could be removed by getting rid of CHILL, which nothing uses
+gcc-2.95
+# tcl8.3 and tcl8.4 is more than enough, consider dropping tcl8.3 too
+tcl8.0
+# no one actually uses this anymore
+#zephyr
+# mdz, 2004-06-15: only pulled in by vim
+ruby1.8
+
+# blacklist: security
+#
+# Packages which are not supportable from a security standpoint
+#
+
+## mdz: Packages noticed in 2004-06-14 review of germinate output
+uw-imap
+# We shall only ship current kernel-source
+kernel-source-2.4.22
+kernel-source-2.4.23
+kernel-source-2.4.24
+kernel-source-2.4.25
+kernel-source-2.2.25
+# results in lots of unwanted setuid-ness; modern stuff uses X or fb
+svgalib
+# we ship server software with TLS built-in
+stunnel
+
+# mdz, 2004-06-15
+apache
+
+## Packages which haven't shown up yet; make sure they don't sneak in
+
+# mdz, 2004-06-14: many, many bugs and unmaintained (both debian and upstream)
+metamail
+# mdz, 2004-06-14: lots of unsafe string handling, CVE-2002-0789,
+# CAN-2003-0436, CAN-2003-0437
+mnogosearch
+# mdz, 2004-06-14: requires no explanation
+wu-ftpd
+# mdz, 2004-06-14: CAN-2003-0781, unmaintained upstream, Debian#210444
+ecartis
+# mdz, 2004-06-14: lots of DoS and other badness, CAN-2003-0946, CAN-2004-0270,
+# debian#209084
+clamav
+# mdz, 2004-06-14: upstream deliberately obfuscates vulnerabilities
+# mdz, 2004-06-20: CAN-2002-0757, CAN-2003-0101, SNS 74, SNS 75
+webmin
+>>>>>>> blacklist
diff --git a/boot b/boot
index cf1dd20..e35392a 100644
--- a/boot
+++ b/boot
@@ -1,3 +1,4 @@
+<<<<<<< boot
 = Kernels and Bootloaders =
 
 The default kernels and bootloaders are not to be installed by debootstrap,
@@ -44,3 +45,5 @@ restricted modules.
 Stop grub-common -> base-files -> awk from selecting mawk. (Since the boot seed doesn't inherit from required for arcane reasons, this is the only way we can make this work reliably ...)
 
  * mawk
+=======
+>>>>>>> boot
diff --git a/build-essential b/build-essential
index f51f613..cc5efb1 100644
--- a/build-essential
+++ b/build-essential
@@ -1,3 +1,4 @@
+<<<<<<< build-essential
  * Feature: no-follow-recommends
 
 This seed is used to implement the debootstrap buildd variant.
@@ -10,3 +11,5 @@ This seed is used to implement the debootstrap buildd variant.
  * libc6-dev [!alpha !ia64]
  * libc6.1-dev [alpha ia64]
  * make
+=======
+>>>>>>> build-essential
diff --git a/desktop b/desktop
 new file mode 100644
index 0000000..eeeb3e5
--- /dev/null
+++ b/desktop
@@ -0,0 +1,208 @@
+<<<<<<< desktop
+=======
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu Kylin desktop
+Task-Extended-Description: This task provides the Ubuntu Kylin desktop environment.
+Task-Key: ubuntukylin-desktop
+Task-Seeds: desktop-common
+
+= Hardware and Architecture Support =
+
+== Architecture-independent ==
+
+Bluetooth:
+
+ * (blueman) # desktop bluetooth support
+
+= Network Services =
+
+Basic network services, VPN and Windows integration.
+
+ * (avahi-autoipd)     # IPv4 link-local interface configuration support
+ * (network-manager-gnome) # see NetworkRoaming spec
+ * (network-manager-pptp-gnome)
+ * (libproxy1-plugin-gsettings)
+ * (libproxy1-plugin-networkmanager)
+ * (ppp)      # ppp utilities useful to be on a CD when someone needs them
+ * (pppconfig)
+ * (pppoeconf)
+ * (kylin-nm)
+ * (net-tools)
+
+= GUI infrastructure =
+
+ * (xterm)
+ * (mate-notification-daemon)
+
+Input methods:
+
+ * (im-config)
+ * (fcitx)
+ * (fcitx-frontend-gtk2)
+ * (fcitx-frontend-gtk3)
+ * (fcitx-frontend-qt5)
+ * (fcitx-ui-classic)
+ * (fcitx-table)
+ * (fcitx-module-cloudpinyin)
+ * (fcitx-googlepinyin)
+
+= Desktop apps =
+
+We use many GNOME applications as part of our desktop user interface. Rather than using Debian's meta-packages they are deliberately expanded so that we can select things a bit better.
+
+ * (apport-gtk)
+ * (whoopsie)
+ * (thunderbird)
+ * (thunderbird-gnome-support)
+ * lightdm
+ * (app-install-data-partner)
+ * (transmission-gtk)
+ * (system-config-printer)
+ * (gnome-font-viewer)
+ * (gucharmap)
+ * language-selector-gnome
+ * (firefox)
+ * (xul-ext-ubufox)
+ * (rhythmbox)
+ * (cheese)
+ * software-properties-gtk
+# * (totem)		   # Ubuntu Kylin remove
+ * ubuntu-release-upgrader-gtk
+ * update-manager
+ * update-notifier
+ * yelp
+ * zenity
+ * (xdg-utils)         # useful utilities
+ * xdg-user-dirs
+ * xdg-user-dirs-gtk
+ * pulseaudio
+ * (pulseaudio-module-bluetooth)
+ * (libglib2.0-bin)     # mostly used as xdg-open backend (gio open)
+ * (gvfs-fuse)          # let non-GNOME apps see GVFS via fuse
+ * (gnome-disk-utility)
+ * (simple-scan)
+ * (remmina)
+ * (shotwell)
+ * (usb-creator-gtk) [i386 amd64]
+ * (deja-dup)
+ * xdiagnose
+ * libcanberra-pulse
+
+Software center
+ * (ubuntu-kylin-software-center)
+
+= Key management and signing =
+
+ * (gnome-keyring)
+ * (seahorse)
+ * (libpam-gnome-keyring)
+
+We use gnupg's pinentry support as of wily, instead of gnome-keyring as before.
+
+ * (gnupg-agent)
+
+Games: We only ship a few by default.
+ * (aisleriot)
+ * (gnome-mahjongg)
+ * (gnome-mines)
+ * (gnome-sudoku)
+ * (branding-ubuntu)       # Ubuntu branding for some games
+
+Default office suite: libreoffice
+
+ * (libreoffice-style-breeze)
+ * (libreoffice-gnome)
+ * (libreoffice-writer)
+ * (libreoffice-calc)
+ * (libreoffice-impress)
+ * (libreoffice-math)
+ * (libreoffice-ogltrans)
+ * (libreoffice-pdfimport)
+
+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.
+
+ * ubuntu-artwork
+ * ubuntu-sounds
+ * gnome-session-canberra   # Needed to make login/logout sounds audible.
+ * dmz-cursor-theme
+
+Boot theme
+
+ * (plymouth-theme-ubuntu-logo)
+
+Fonts
+
+ * (fonts-noto)
+ * (fonts-noto-color-emoji)
+
+Settings: we have some settings overrides by default in an unique package.
+ * ubuntu-settings
+ * ubuntukylin-default-settings # Ubuntu Kylin add
+
+The gstreamer1.0 packages we want to install:
+
+ * gstreamer1.0-alsa
+ * gstreamer1.0-plugins-base-apps
+ * gstreamer1.0-pulseaudio
+
+Accessibility tools:
+
+ * (gnome-accessibility-themes)
+ * (orca)
+ * (onboard)
+ * (brltty)
+ * (xcursor-themes)
+ * (speech-dispatcher)
+ * (mousetweaks)
+ * at-spi2-core
+ * libatk-adaptor
+
+= Documentation =
+
+ * doc-base         # integrates with scrollkeeper
+ * (ubuntu-kylin-docs)		# Ubuntu Kylin add
+
+= Other =
+
+ * ubuntukylin-desktop # metapackage for everything here
+# * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent)			#ubuntukylin remove
+ * (libwmf0.2-7-gtk)
+
+= Ubuntu Kylin =
+ * ukui-greeter
+ * (youker-assistant)
+ * ubuntukylin-wallpapers
+ * ubuntukylin-keyring
+ * (firefox-locale-zh-hans)
+ * (thunderbird-locale-zh-hans)
+ * (thunderbird-locale-zh-cn)
+ * (libreoffice-l10n-zh-cn)
+ * ubuntukylin-theme
+ * (indicator-china-weather)
+ * ukui-desktop-environment
+ * ukui-menu
+ * ukui-session-manager
+ * ukui-control-center
+ * ukui-screensaver
+ * peony
+ * ukwm
+ * ukui-media
+ * ukui-panel
+ * ukui-sidebar
+ * ukui-settings-daemon
+ * ukui-power-manager
+ * (kylin-display-switch)
+ * (ukui-window-switch)
+ * (kylin-burner)
+ * (kylin-video)
+ * ukui-polkit
+ * (qt5-ukui-platformtheme)
+
+= MATE applications =
+ * (mate-calc)
+ * (pluma)
+ * (mate-system-monitor)
+ * (mate-terminal)
+ * (atril)
+>>>>>>> desktop
diff --git a/desktop.minimal-remove b/desktop.minimal-remove
 new file mode 100644
index 0000000..1ba5647
--- /dev/null
+++ b/desktop.minimal-remove
@@ -0,0 +1,198 @@
+# This is a list of packages to be removed when the 'minimal' option is
+# selected during installation.
+
+# Note that the format is NOT the same as the usual seed format. This file is
+# not processed by germinate - it is simply downloaded during image builds.
+
+# kylin-video
+
+kylin-video
+mplayer
+mpv
+libavdevice58
+liblua5.2-0
+libdc1394-22
+libdvdnav4
+libopenal1
+libopenal-data
+libsdl2-2.0-0
+libsndio7.0
+libva-wayland2
+
+# youtube-dl
+
+ffmpeg
+libavresample4
+libqt5core5a
+libqt5gui5
+libqt5svg5
+libqt5network5
+libqt5positioning5
+libqt5printsupport5
+libqt5qml5
+libqt5quick5
+libqt5sensors5
+libqt5webchannel5
+libqt5webkit5
+libqt5widgets5
+phantomjs
+python3-pyxattr
+rtmpdump
+youtube-dl
+
+# Deja Dup
+
+deja-dup
+deja-dup-caja
+duplicity
+gir1.2-caja-2.0
+gir1.2-gtk-3.0
+libgoa-1.0-0b
+libnautilus-extension1a
+librsync1
+librsync2
+python3-bcrypt
+python3-fasteners
+python3-future
+python3-lib2to3
+python3-lockfile
+python3-monotonic
+python3-paramiko
+
+# Documentation
+
+ubuntu-kylin-docs
+
+# GNOME Disks
+
+cracklib-runtime
+gnome-disk-utility
+libcrack2
+libpwquality-common
+libpwquality1
+
+# GUFW
+
+gufw
+
+# LibreOffice
+
+fonts-liberation2
+fonts-opensymbol
+gstreamer1.0-gtk3
+libabw-0.1-1
+libboost-date-time1.67.0
+libboost-filesystem1.67.0
+libboost-iostreams1.67.0
+libboost-locale1.67.0
+libboost-system1.67.0
+libboost-thread1.67.0
+libcdr-0.1-1
+libclucene-core1v5
+libclucene-contribs1v5
+libcmis-0.5-5v5
+libcolamd2
+libe-book-0.1-1
+libeot0
+libepubgen-0.1-1
+libetonyek-0.1-1
+libexttextcat-2.0-0
+libexttextcat-data
+libfreehand-0.1-1
+libgpgmepp6
+liblangtag-common
+liblangtag1
+libmhash2
+libmspub-0.1-1
+libmwaw-0.3-3
+libmythes-1.2-0
+libneon27-gnutls
+libodfgen-0.1-1
+liborcus-0.14-0
+libpagemaker-0.0-0
+libraptor2-0
+librasqal3
+librdf0
+librevenge-0.0-0
+libsuitesparseconfig5
+libvisio-0.1-1
+libwpd-0.10-10
+libwpg-0.3-3
+libwps-0.4-4
+libxmlsec1
+libxmlsec1-nss
+libyajl2
+libreoffice-avmedia-backend-gstreamer
+libreoffice-base-core
+libreoffice-calc
+libreoffice-common
+libreoffice-core
+libreoffice-draw
+libreoffice-gnome
+libreoffice-gtk3
+libreoffice-impress
+libreoffice-l10n-zh-cn
+libreoffice-math
+libreoffice-ogltrans
+libreoffice-pdfimport
+libreoffice-style-colibre
+libreoffice-style-elementary
+libreoffice-style-galaxy
+libreoffice-style-tango
+libreoffice-writer
+lp-solve
+python3-uno
+uno-libs3
+ure
+
+# Rhythmbox
+
+gir1.2-gst-plugins-base-1.0
+gir1.2-gstreamer-1.0
+gir1.2-rb-3.0
+libdmapsharing-3.0-2
+libgom-1.0-0
+libgpod-common
+libgpod4
+libgrilo-0.3-0
+liblirc-client0
+libsgutils2-2
+librhythmbox-core10
+libtotem-plparser18
+libtotem-plparser-common
+media-player-info
+python3-mako
+python3-markupsafe
+rhythmbox
+rhythmbox-data
+rhythmbox-plugin-alternative-toolbar
+rhythmbox-plugins
+
+# Seahorse
+
+seahorse
+
+# Transmission
+
+libcurl4
+libevent-2.1-6
+libminiupnpc17
+libnatpmp1
+transmission-common
+transmission-gtk
+
+# Shotwell
+
+libexiv2-14
+libgexiv2-2
+libraw19
+shotwell
+shotwell-common
+
+# Simple Scan
+
+simple-scan
+
+# indicator-china-weather
+
+indicator-china-weather
diff --git a/doc/langpacks.txt b/doc/langpacks.txt
index 81c8baa..b234e4c 100644
--- a/doc/langpacks.txt
+++ b/doc/langpacks.txt
@@ -27,6 +27,7 @@ language and all languages above it.
 The list is vertically ordered by the priority, i. e. they should be
 added from top to down.
 
+<<<<<<< doc/langpacks.txt
 Input support packages
 ======================
 
@@ -39,3 +40,19 @@ language code:
   check-language-support -l ja --show-installed -p ibus
 
 This displays the input methods for Japanese ("ja").
+=======
+Language support on DVDs
+========================
+
+CDs are generally too small to ship a significant amount of language support
+packages (spell checkers, etc.), thus we only ship a subset for English there.
+
+On DVDs, you should use check-language-support (from the
+language-selector-common package) to compute the set of langauge support
+packages which you want to add to DVD ship ("dvd-langsupport") or the DVD live
+system ("dvd-live-langsupport"). Generate these with this command:
+
+  for l in en es xh pt de fr; do echo "= Language support for $l ="; check-language-support --show-installed -l $l | xargs -n1 | sed 's/^/ * /'; echo; done > dvd-langsupport
+
+Update the list of languages accordingly.
+>>>>>>> doc/langpacks.txt
diff --git a/installer b/installer
index a7135de..2c68722 100644
--- a/installer
+++ b/installer
@@ -1 +1,4 @@
+<<<<<<< installer
 Empty installer seed, in case any other seeds still reference it.
+=======
+>>>>>>> installer
diff --git a/live b/live
 new file mode 100644
index 0000000..579138b
--- /dev/null
+++ b/live
@@ -0,0 +1,50 @@
+<<<<<<< live
+=======
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu Kylinlive CD
+Task-Extended-Description: This task provides the extra packages installed on the Ubuntu Kylin 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}
+
+# subset of English language support which we want by default:
+# * libreoffice-help-en-us [i386 amd64]		# Ubuntu Kylin remove
+ * hunspell-en-us
+ * wamerican
+
+ * Languages: zh-hans
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+
+Enough room on i386/powerpc, not enough on amd64:
+# * Languages: pt de
+# * language-pack-${Languages} [i386 powerpc]
+# * language-pack-gnome-${Languages} [i386 powerpc]
+
+ * 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		# Ubuntu Kylin remove
+ * ubiquity-slideshow-ubuntukylin	# Ubuntu Kylin add
+
+== ZFS support ===
+
+ * zfsutils-linux
+ * zfs-initramfs
+ * zsys
+
+== Secureboot setup ==
+ * shim-signed [amd64]
+>>>>>>> live
diff --git a/minimal b/minimal
index d2b806a..b0c4116 100644
--- a/minimal
+++ b/minimal
@@ -1,3 +1,4 @@
+<<<<<<< minimal
 Task-Section: user
 Task-Relevance: 9
 Task-Description: Minimal base system
@@ -61,3 +62,5 @@ These provide various networking services, all should be configured in a client-
  * init               # ensure we have an init system (but minimal chroots)
  * ubuntu-minimal     # Ubuntu-specific bits we want on every Ubuntu system
 
+=======
+>>>>>>> minimal
diff --git a/required b/required
index f309b2d..7230208 100644
--- a/required
+++ b/required
@@ -1,3 +1,4 @@
+<<<<<<< required
 This seed describes the packages at Priority: required. These packages are installed by the first pass of debootstrap, which extracts them (dpkg -x, without running maintainer scripts) in order to construct a basic environment into which it can chroot and install them properly.
 
 A system containing only required packages is not a supported Ubuntu system; you need to install at least the packages from minimal as well.
@@ -48,3 +49,5 @@ Other packages necessary to get started:
  * procps
  * sensible-utils # used to be pulled in by debianutils, tons of undeclared deps
  * sysvinit-utils # pidof tool (Debian #810018) and init-d-script for SysV init scripts
+=======
+>>>>>>> required
diff --git a/ship-live b/ship-live
 new file mode 100644
index 0000000..9df49f0
--- /dev/null
+++ b/ship-live
@@ -0,0 +1,41 @@
+<<<<<<< ship-live
+=======
+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.
+
+== Hardware & Network Access ==
+
+ * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
+ * sl-modem-daemon	# needed for some Winmodems (see OutoftheboxWinmodem)
+ * intel-microcode      # needed to update Intel cpu microcode LP #1386257
+ * amd64-microcode  # needed to update AMD cpu microcode LP #1386257
+
+ * libatm1	# suggested by ppp for PPP-over-ATM
+ * setserial	# needed by folks with nonstandard serial ports
+ * 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
+
+ * /^linux-modules-nvidia-[0-9]+-generic/
+ * /^nvidia-driver-[0-9]+/  # Needed for networkless installation of graphics drivers
+
+== Installer ==
+
+ * grub-efi-amd64-signed [amd64]
+ * grub-efi-arm64 [arm64]
+ * shim-signed [amd64]
+ * oem-config-gtk
+ * oem-config-slideshow-ubuntu
+ * 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*
+>>>>>>> ship-live
diff --git a/standard b/standard
index bd6a467..25d84eb 100644
--- a/standard
+++ b/standard
@@ -1,3 +1,4 @@
+<<<<<<< standard
 Task-Section: user
 Task-Relevance: 8
 Task-Description: Standard system
@@ -85,3 +86,5 @@ These are used for debugging problems or examining the system.
  * ubuntu-standard # metapackage for everything here
  * (apt) # James Westby, enables access to private PPAs among other things
  * language-selector-common # helps installer to work out which language-support packages to install
+=======
+>>>>>>> standard
diff --git a/supported b/supported
 new file mode 100644
index 0000000..0c50dfe
--- /dev/null
+++ b/supported
@@ -0,0 +1,316 @@
+<<<<<<< supported
+=======
+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.
+
+ * /^evolution-documentation-/
+ * /^libreoffice-help-/
+ * /^libreoffice-l10n-/
+ * /^thunderbird-locale-/
+ * /^firefox-locale-/
+ * poppler-data
+# * ibus-sunpinyin		# Ubuntu Kylin remove
+
+The following input aids are also installed on demand by
+language-selector:
+
+ * libenchant-voikko
+ * libreoffice-voikko
+ * mozvoikko
+ * tmispell-voikko
+ * openoffice.org-hyphenation
+ * /^hyphen-..$/
+ * hyphen-en-us
+ * /^mythes-/
+ * /^hunspell-[^-]*$/
+ * hunspell-eu-es
+ * hunspell-sv-se
+ * hunspell-gl-es
+ * hunspell-br
+
+myspell packages containing the hunspell dictionaries:
+
+ * myspell-af
+ * myspell-bg
+ * myspell-ca
+ * myspell-cs
+ * myspell-el-gr
+ * myspell-en-au
+ * myspell-en-gb
+ * myspell-en-us
+ * myspell-en-za
+ * myspell-eo
+ * myspell-es
+ * myspell-et
+ * myspell-fa
+ * myspell-fo
+ * myspell-ga
+ * myspell-gd
+ * myspell-gv
+ * myspell-he
+ * myspell-hr
+ * myspell-hy
+ * myspell-it
+ * myspell-ku
+ * myspell-lt
+ * myspell-lv
+ * myspell-nb
+ * myspell-nl
+ * myspell-nn
+ * myspell-nr
+ * myspell-ns
+ * myspell-pl
+ * myspell-pt
+ * myspell-sk
+ * myspell-sl
+ * myspell-ss
+ * myspell-st
+ * hunspell-sv-se
+ * myspell-sw
+ * myspell-th
+ * myspell-tn
+ * myspell-ts
+ * myspell-uk
+ * myspell-ve
+ * myspell-xh
+ * myspell-zu
+
+Other dictionaries, word lists, and thesauri:
+
+ * dict-foldoc
+ * dict-gcide
+ * dict-jargon
+ * dict-moby-thesaurus
+ * dict-vera
+ * dictd
+ * mythes-ca
+ * mythes-cs
+ * mythes-de
+ * mythes-de-ch
+ * mythes-en-au
+ * mythes-en-us
+ * mythes-fr
+ * mythes-hu
+ * mythes-it
+ * mythes-ne
+ * mythes-pl
+ * mythes-ro
+ * mythes-ru
+ * mythes-sk
+ * wamerican
+ * wbrazilian
+ * wbritish
+ * wbulgarian
+ * wcatalan
+ * wdanish
+ * wdutch
+ * wfaroese
+ * wfrench
+ * wgalician-minimos
+ * wirish
+ * witalian
+ * wmanx
+ * wngerman
+ * wnorwegian
+ * wogerman
+ * wpolish
+ * wportuguese
+ * wspanish
+ * wswedish
+ * wswiss
+ * wukrainian
+
+Fonts installed on demand by language-selector:
+
+ * fonts-arabeyes
+ * fonts-arphic-ukai
+ * fonts-arphic-uming
+ * fonts-farsiweb
+# * fonts-kacst			# Ubuntu Kylin remove
+ * fonts-khmeros
+# * fonts-lao			# Ubuntu Kylin remove
+ * fonts-manchufont
+ * fonts-mgopen
+ * fonts-nafees
+ * fonts-sil-abyssinica
+ * fonts-sil-ezra
+ * fonts-sil-nuosusil
+ * fonts-sil-padauk
+ * fonts-sil-scheherazade
+# * fonts-thai-tlwg		# Ubuntu Kylin remove
+ * fonts-tibetan-machine
+ * fonts-ukij-uyghur
+ * ttf-alee
+ * ttf-bengali-fonts
+ * ttf-devanagari-fonts
+ * ttf-gujarati-fonts
+ * ttf-kannada-fonts
+ * ttf-malayalam-fonts
+ * ttf-oriya-fonts
+ * ttf-punjabi-fonts
+ * ttf-tamil-fonts
+ * ttf-telugu-fonts
+# * ttf-wqy-zenhei               # deprecated
+
+Input methods installed on demand by language-selector:
+
+ * gtk-im-libthai
+ * ibus-anthy
+ * ibus-chewing
+ * ibus-hangul
+ * ibus-m17n
+ * ibus-sunpinyin
+ * ibus-table-cangjie
+ * ibus-table-wubi
+ * ibus-unikey
+
+Transitional packages:
+
+
+Transitional packages for upgrading 12.04.[1-9] with LTS enablement stacks to
+14.04 (remove them entirely in 14.10):
+ * %xorg-lts-transitional
+ * !xserver-xorg-video-geode-lts-quantal
+ * !xserver-xorg-video-geode-lts-raring
+ * !xserver-xorg-video-geode-lts-saucy
+ * !xserver-xorg-input-mtrack-lts-quantal
+ * !xserver-xorg-input-mtrack-lts-saucy
+ * !xserver-xorg-input-mtrack-lts-raring
+ * !xserver-xorg-input-kbd-lts-quantal
+ * !xserver-xorg-input-kbd-lts-saucy
+ * !xserver-xorg-input-kbd-lts-raring
+ * !xserver-xorg-input-joystick-lts-quantal
+ * !xserver-xorg-input-joystick-lts-saucy
+ * !xserver-xorg-input-joystick-lts-raring
+ * !xserver-xorg-input-joystick-dev-lts-quantal
+ * !xserver-xorg-input-joystick-dev-lts-saucy
+ * !xserver-xorg-input-joystick-dev-lts-raring
+
+= Installed on demand =
+
+ * apparmor-utils    # AppArmor profile development
+ * apparmor-notify   # LP: #893266
+ * apparmor-profiles
+ * libapache2-mod-apparmor
+ * libpam-apparmor
+ * python-libapparmor
+ * python3-libapparmor
+ * python-ufw
+ * libseccomp-dev    # promote its use, LP: #1082431
+ * auditd
+
+= Extra server bits =
+
+ * postgresql-plperl-9.3
+ * postgresql-plpython-9.3
+ * postgresql-plpython3-9.3
+ * postgresql-pltcl-9.3
+ * hv-kvp-daemon-init
+ * cloud-utils
+ * nginx
+ * joyent-mdata-client
+ * sssd
+ * sssd-tools
+
+= Rescued from Extra =
+
+ * Extra-Include: *-dbg *-debug *-dev *-doc *-docs *-gcj gir1.2-* *-examples
+
+... 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*go0-dbg
+ * Extra-Exclude: lib*objc1-dbg
+ * Extra-Exclude: lldb-* clang* libclang* libllvm-*
+ * 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 libboost*-all-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
+ * Extra-Exclude: python-vigra-doc # libvigraimpex is in main, but nothing uses python-vigra
+ * Extra-Exclude: asp.net-examples
+ * Extra-Exclude: packagekit-dbg
+ * Extra-Exclude: rest-bench-dbg
+ * Extra-Exclude: grub-coreboot-dbg grub-emu-dbg
+ * Extra-Exclude: ceph-test-dbg ceph-fs-common-dbg ceph-mds-dbg
+ * Extra-Exclude: unity-webapps-dev # we don't want its deps in main
+ * Extra-Exclude: sndfile-programs-dbg # sndfile-programs not in main
+ * Extra-Exclude: ubuntu-ui-toolkit-examples
+ * Extra-Exclude: speech-dispatcher-dbg
+ * Extra-Exclude: nginx-extras-dbg nginx-full-dbg nginx-light-dbg nginx-naxsi-dbg
+
+Transitional packages:
+
+ * 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:
+
+ * libreoffice-evolution # no rdepends any more, noticed too late
+ * openjade # (b-d of opensp, avoid component-mismatch on openjade-1.3)
+
+= Build infrastructure =
+
+ * pkgbinarymangler # needs to be in main to stay in the buildd chroots
+
+= Other =
+
+ * icedtea-plugin
+ * evolution # still supported for business environment
+ * miscfiles
+ * sosreport # AdamStokes LP: #1206106
+ * nvidia-prime
+ * fglrx-pxpress
+ * ipxe
+>>>>>>> supported
diff --git a/supported-desktop-extra b/supported-desktop-extra
 new file mode 100644
index 0000000..36d3e97
--- /dev/null
+++ b/supported-desktop-extra
@@ -0,0 +1,35 @@
+This seed exists only to allow fine tuning the 3y support time
+
+= Dev tools =
+
+ * cdbs
+ * gnupg2
+
+= Documentation =
+ * gnupg-doc
+ * tar-doc
+
+= Additional multimedia =
+
+ * gstreamer1.0-tools
+
+= Extra desktop =
+
+ * libreoffice-base
+ * thunderbird-gnome-support
+ * rhythmbox
+ * evolution-exchange
+ * evolution-indicator
+ * icc-profiles-free
+ * virt-manager
+ * xchat-gnome
+ * vim-gnome
+
+= Command line tools =
+
+ * bittornado
+ * virtinst
+
+= Certification =
+
+ * lsb