Merge ~rbalint/ubuntu-seeds/+git/ubuntu:disco into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:disco

[Balint Reczey]

Unmerged commits

648eb6a... by Balint Reczey on 2019-03-06

Add wsl seed

f481cb9... by Jeremy Bícha on 2019-02-15

desktop-minimal: blacklist notification-daemon

gnome-control-center recommends network-manager-gnome
which depends on gnome-shell | notification-daemon
but gnome-shell isn't built on s390x.

So we blacklist notification-daemon to keep it out
of main despite the indirect recommends.

636d366... by Jeremy Bícha on 2019-02-24

Revert "desktop-minimal: blacklist notification-daemon"

This reverts commit 2f639d44aa0bf5bc5a4b66e979ad910bcdbdebb3.

This is longer needed. See the previous commit for more info.

df4b17f... by Jeremy Bícha on 2019-02-24

Revert "desktop: Add gnome-shell"

This reverts commit 39b521a649b6068df697cf1e286e80e3dec285f1.

This is no longer needed now that notification-daemon has
been fully demoted. The final fix was:
https://launchpad.net/ubuntu/+source/libnotify/0.7.7-4ubuntu4

d2beb8f... by Jeremy Bícha on 2019-02-24

supported: Exclude libhandy-*-dev since we don't want glade in main now

LP: #1815483

9c1df56... by Dimitri John Ledkov on 2019-02-22

Add multipath tools by default, on server-like things.

0e36c58... by Julian Andres Klode on 2019-02-18

Extra-Exclude python-*-{dbg,dev} from supported

This probably is pulling in quite some python2 binaries that we
do not actually want in main as we are only interested in their
python3 variants. One example is python-apt.

If there are any packages demoted by this, we should investigate
and manually seed them.

39b521a... by Jeremy Bícha on 2019-02-16

desktop: Add gnome-shell

to try harder to not have libnotify4 pull notification-daemon in to main

2f639d4... by Jeremy Bícha on 2019-02-15

desktop-minimal: blacklist notification-daemon

libnotify4 depends on gnome-shell | notification-daemon but
that's not enough to keep notification-daemon out of main so
let's try blacklisting it

a12285d... by Andreas Hasenack on 2018-10-31

Remove debian-goodies from server-ship.

It was first added in 2005, and is deemed unnecessary now [SLC 18.10 sprint].
It recommends elfutils.

diff --git a/STRUCTURE b/STRUCTURE
index ca47542..e754437 100644
--- a/STRUCTURE
+++ b/STRUCTURE
@@ -1,3 +1,4 @@
+<<<<<<< STRUCTURE
 feature follow-recommends
 feature no-follow-build-depends
 required:
@@ -26,3 +27,33 @@ supported-sysadmin-common: standard
 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-cloud
 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.disco
+include ubuntu.disco/languages
+desktop: desktop-minimal desktop-common
+desktop-minimal: desktop-common
+dns-server: standard
+lamp-server: standard
+openssh-server: standard
+print-server: standard
+samba-server: standard
+postgresql-server: standard
+mail-server: standard
+server: standard
+server-ship: boot installer dns-server lamp-server openssh-server print-server samba-server postgresql-server mail-server server d-i-requirements
+server-ship-live: server
+cloud-image: standard
+ship: boot installer desktop d-i-requirements
+live: desktop live-common desktop-default-languages
+ship-live: boot live
+development: desktop
+supported-desktop-extra: desktop live
+supported-kiosk: desktop
+system-image: boot
+wsl: minimal
+# make sure supported remains the last entry
+supported: supported-common server-ship server-ship-live cloud-image ship ship-live development language-packs supported-desktop-extra supported-kiosk
+# default language support
+desktop-default-languages: desktop-minimal-default-languages desktop-en desktop-es desktop-de desktop-fr desktop-it desktop-pt desktop-ru desktop-zh
+desktop-minimal-default-languages: desktop-minimal-en desktop-minimal-es desktop-minimal-de desktop-minimal-fr desktop-minimal-it desktop-minimal-pt desktop-minimal-ru desktop-minimal-zh
+>>>>>>> STRUCTURE
diff --git a/boot b/boot
index e2687f3..8145909 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,
@@ -51,3 +52,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/cloud-image b/cloud-image
new file mode 100644
index 0000000..6a721a3
--- /dev/null
+++ b/cloud-image
@@ -0,0 +1,11 @@
+Task-Section: server
+Task-Description: Ubuntu Cloud Image (instance)
+Task-Extended-Description: Packages included in Ubuntu Cloud images.
+Task-Key: cloud-init
+
+= Ubuntu Server =
+ * ubuntu-server
+
+= Additional cloud-image only packages =
+ * cloud-init			# Standard Ubuntu cloud boot support (LP: #1576351)
+ * openssh-server		# Standard way to access a server (LP: #1576353)
diff --git a/desktop b/desktop
new file mode 100644
index 0000000..6030285
--- /dev/null
+++ b/desktop
@@ -0,0 +1,65 @@
+<<<<<<< desktop
+=======
+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-minimal desktop-common
+
+= GUI infrastructure =
+
+Desktop Experience:
+ * (thunderbird-gnome-support)
+
+= 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.
+
+ * (thunderbird)
+ * (transmission-gtk)
+ * (gnome-todo)
+ * (baobab)
+ * (rhythmbox)
+ * (cheese)
+ * (totem)
+ * (vino) # vnc server
+ * (simple-scan)
+ * (remmina)
+ * (shotwell)
+ * (usb-creator-gtk) [i386 amd64]
+ * (deja-dup)
+ * (gnome-calendar)
+ 
+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)
+
+Others
+
+ * (fonts-noto-color-emoji)
+
+Custom launchers to be displayed on the Dash by default
+
+ * (ubuntu-web-launchers)
+
+= Other =
+
+ * ubuntu-desktop-minimal # we are a superset of minimal
+ * ubuntu-desktop # metapackage for everything here
+ * (example-content)
+>>>>>>> desktop
diff --git a/desktop-default-languages b/desktop-default-languages
new file mode 100644
index 0000000..f1d45fc
--- /dev/null
+++ b/desktop-default-languages
@@ -0,0 +1,17 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu desktop default languages
+Task-Extended-Description: This task provides the Ubuntu desktop default languages.
+Task-Key: hyphen-de hyphen-en-us hyphen-es hyphen-fr hyphen-it hyphen-pt-pt hyphen-ru firefox-locale-zh-hans
+Task-Seeds: desktop-minimal-default-languages desktop-en desktop-es desktop-de desktop-fr desktop-it desktop-pt desktop-ru desktop-zh desktop-minimal-en desktop-minimal-es desktop-minimal-de desktop-minimal-fr desktop-minimal-it desktop-minimal-pt desktop-minimal-ru desktop-minimal-zh
+
+The full rationale on how we choose the languages and what we install
+is at https://launchpad.net/bugs/1520278
+
+The ones currently installed on the live are:
+en, es, pt, de, fr, it, ru, zh (simplified)
+
+This should install check-language-support --show-installed -l $LANG from
+default live.
+
+For the tasks to appear in tasksel, it needs a Key package, We take the en langpack.
diff --git a/desktop-minimal b/desktop-minimal
new file mode 100644
index 0000000..f4d249d
--- /dev/null
+++ b/desktop-minimal
@@ -0,0 +1,172 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu minimal desktop
+Task-Extended-Description: This task provides the Ubuntu desktop minimal environment.
+Task-Key: ubuntu-desktop-minimal
+Task-Seeds: desktop-common
+
+= Hardware and Architecture Support =
+
+== Architecture-independent ==
+
+Bluetooth:
+
+ * (gnome-bluetooth) # desktop bluetooth support
+
+= Network Services =
+
+Basic network services, VPN and Windows integration.
+
+ * (avahi-autoipd)     # IPv4 link-local interface configuration support
+ * (network-manager)
+ * (network-manager-config-connectivity-ubuntu)
+ * (network-manager-pptp-gnome)
+ * (network-manager-openvpn-gnome)
+ * (libproxy1-plugin-gsettings)
+ * (libproxy1-plugin-networkmanager)
+ * (ppp)      # ppp utilities useful to be on a CD when someone needs them
+ * (pppconfig)
+ * (pppoeconf)
+
+= GUI infrastructure =
+
+ * libnotify-bin                  # various scripts need notify-send (such as .bashrc's "alert")
+ * !notification-daemon           # gnome-shell provides this feature instead
+
+Input methods:
+
+ * (im-config)
+ * (ibus)
+ * (ibus-gtk)
+ * (ibus-gtk3)
+ * (ibus-table)
+
+Desktop Experience:
+ * gnome-shell
+ * ubuntu-session [!s390x]
+ * gnome-shell-extension-desktop-icons
+ * gnome-shell-extension-ubuntu-dock
+ * gnome-shell-extension-appindicator
+ * (gir1.2-gmenu-3.0) # LP: #1726093
+ * (gnome-initial-setup)
+ * (ubuntu-report)
+
+= 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)
+ * (eog)
+ * (file-roller)
+ * gdm3
+ * (gedit)
+ * (app-install-data-partner)
+ * gnome-settings-daemon
+ * gnome-control-center
+ * gnome-menus
+ * (system-config-printer)
+ * (gnome-power-manager)
+ * (gnome-terminal)
+ * (gnome-screenshot)
+ * (gnome-font-viewer)
+ * language-selector-gnome
+ * (firefox)
+ * (xul-ext-ubufox)
+ * nautilus
+ * (nautilus-sendto)
+ * (nautilus-share)
+ * software-properties-gtk
+ * ubuntu-release-upgrader-gtk
+ * update-manager
+ * update-notifier
+ * yelp
+ * zenity
+ * (xdg-desktop-portal-gtk) # Useful for desktop snaps
+ * (xdg-utils)         # useful utilities
+ * xdg-user-dirs
+ * xdg-user-dirs-gtk
+ * pulseaudio
+ * (pulseaudio-module-bluetooth)
+ * gvfs-bin             # mostly used as xdg-open backend
+ * (gvfs-fuse)          # let non-GNOME apps see GVFS via fuse
+ * (gnome-disk-utility)
+ * (evince)
+ 
+ Desktop snaps: these also exist in ubuntu-release-upgrader's DistUpgradeQuirks.py for users who upgrade.
+ * snap:gnome-3-26-1604
+ * snap:gtk-common-themes
+ * snap:gnome-calculator
+ * snap:gnome-characters
+ * snap:gnome-logs
+ * snap:gnome-system-monitor
+
+Software center
+ * (ubuntu-software)
+ * (gnome-software-plugin-snap)
+
+= 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.
+
+ * (gpg-agent)
+ * (dirmngr)
+
+Themes: we will ship only the very best looking themes. We won't ship everything that Debian ships, just a custom package that includes our default theme.
+
+Yaru Theming
+
+ * (yaru-theme-gnome-shell)
+ * (yaru-theme-gtk)
+ * (yaru-theme-icon)
+ * (yaru-theme-sound)
+
+Wallpapers
+
+ * (ubuntu-wallpapers)
+
+Others
+
+ * gnome-session-canberra   # Needed to make login/logout sounds audible.
+ * dmz-cursor-theme
+
+Boot theme
+
+ * (plymouth-theme-ubuntu-logo)
+
+Settings: we have some settings overrides by default in an unique package.
+          and provide our ones, like sound settings
+ * ubuntu-settings
+ * (gsettings-ubuntu-schemas)
+
+The gstreamer1.0 packages we want to install:
+
+ * gstreamer1.0-alsa
+ * gstreamer1.0-plugins-base-apps
+ * gstreamer1.0-packagekit
+ * gstreamer1.0-pulseaudio
+
+Accessibility tools:
+
+ * (gnome-accessibility-themes)
+ * (orca)
+ * (brltty)
+ * (xcursor-themes)
+ * (speech-dispatcher)
+ * (mousetweaks)
+ * at-spi2-core
+ * libatk-adaptor
+
+= Documentation =
+
+ * (ubuntu-docs)
+ * (gnome-getting-started-docs)
+
+= Other =
+
+ * ubuntu-desktop-minimal # metapackage for everything here
+ * (libwmf0.2-7-gtk) # provides a gdk-pixbuf loader for WMF images
diff --git a/desktop-minimal-default-languages b/desktop-minimal-default-languages
new file mode 100644
index 0000000..498a5a7
--- /dev/null
+++ b/desktop-minimal-default-languages
@@ -0,0 +1,17 @@
+Task-Per-Derivative: 1
+Task-Section: user
+Task-Description: Ubuntu minimal desktop default languages
+Task-Extended-Description: This task provides the Ubuntu minimal desktop default languages.
+Task-Key: language-pack-en language-pack-es language-pack-de language-pack-fr language-pack-it language-pack-pt language-pack-ru language-pack-zh-hans
+Task-Seeds: desktop-minimal-en desktop-minimal-es desktop-minimal-de desktop-minimal-fr desktop-minimal-it desktop-minimal-pt desktop-minimal-ru desktop-minimal-zh
+
+The full rationale on how we choose the languages and what we install
+is at https://launchpad.net/bugs/1520278
+
+The ones currently installed on the live are:
+en, es, pt, de, fr, it, ru, zh (simplified)
+
+This should install check-language-support --show-installed -l $LANG from
+default live.
+
+For the tasks to appear in tasksel, it needs a Key package, We take the en langpack.
diff --git a/desktop.minimal-remove b/desktop.minimal-remove
new file mode 100644
index 0000000..8b6e9f4
--- /dev/null
+++ b/desktop.minimal-remove
@@ -0,0 +1,190 @@
+# 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.
+
+# Desktop apps
+thunderbird
+transmission-gtk
+gnome-todo
+baobab
+rhythmbox
+cheese
+vino
+shotwell
+totem
+usb-creator-gtk
+deja-dup
+gnome-calendar
+remmina
+simple-scan
+
+# Desktop experience
+thunderbird-gnome-support
+
+# Games
+aisleriot
+gnome-mahjongg
+gnome-mines
+gnome-sudoku
+branding-ubuntu
+
+# Libreoffice
+libreoffice-style-breeze
+libreoffice-gnome
+libreoffice-writer
+libreoffice-calc
+libreoffice-impress
+libreoffice-math
+libreoffice-ogltrans
+libreoffice-pdfimport
+
+# Others
+example-content
+ubuntu-web-launchers
+fonts-noto-color-emoji
+
+# Langpacks (keeping libreoffice and thunderbird installed otherwise)
+libreoffice-l10n-en-gb
+libreoffice-l10n-es
+libreoffice-l10n-zh-cn
+libreoffice-l10n-zh-tw
+libreoffice-l10n-pt
+libreoffice-l10n-pt-br
+libreoffice-l10n-de
+libreoffice-l10n-fr
+libreoffice-l10n-it
+libreoffice-l10n-ru
+libreoffice-l10n-en-za
+libreoffice-help-en-gb
+libreoffice-help-es
+libreoffice-help-zh-cn
+libreoffice-help-zh-tw
+libreoffice-help-pt
+libreoffice-help-pt-br
+libreoffice-help-de
+libreoffice-help-fr
+libreoffice-help-it
+libreoffice-help-ru
+libreoffice-help-en-us
+thunderbird-locale-en
+thunderbird-locale-en-gb
+thunderbird-locale-en-us
+thunderbird-locale-es
+thunderbird-locale-es-ar
+thunderbird-locale-es-es
+thunderbird-locale-zh-cn
+thunderbird-locale-zh-hans
+thunderbird-locale-zh-hant
+thunderbird-locale-zh-tw
+thunderbird-locale-pt
+thunderbird-locale-pt-br
+thunderbird-locale-pt-pt
+thunderbird-locale-de
+thunderbird-locale-fr
+thunderbird-locale-it
+thunderbird-locale-ru
+
+# Unused rdepends
+gir1.2-rb-3.0
+gir1.2-totem-1.0
+gir1.2-totemplparser-1.0
+guile-2.0-libs
+libabw-0.1-1
+libavahi-ui-gtk3-0
+libdmapsharing-3.0-2
+libexttextcat-2.0-0
+libexttextcat-data
+libfreehand-0.1-1
+libgnome-games-support-1-3
+libgnome-games-support-common
+libgom-1.0-0
+libgrilo-0.3-0
+liblangtag-common
+liblangtag1
+libmessaging-menu0
+libmhash2
+libminiupnpc10
+libmwaw-0.3-3
+libmythes-1.2-0
+libnatpmp1
+libneon27-gnutls
+liborcus-0.13-0
+libpagemaker-0.0-0
+librdf0
+libreoffice-avmedia-backend-gstreamer
+libreoffice-base-core
+libreoffice-common
+libreoffice-core
+libreoffice-draw
+libreoffice-gtk3
+libreoffice-style-colibre
+libreoffice-style-elementary
+libreoffice-style-tango
+libraptor2-0
+librasqal3
+librevenge-0.0-0
+librhythmbox-core10
+libtotem0
+libvisio-0.1-1
+libwpd-0.10-10
+libwpg-0.3-3
+libwps-0.4-4
+libyajl2
+python3-uno
+rhythmbox-data
+rhythmbox-plugin-alternative-toolbar
+rhythmbox-plugins
+remmina-common
+remmina-plugin-rdp
+remmina-plugin-secret
+remmina-plugin-vnc
+duplicity
+seahorse-daemon
+shotwell-common
+totem-common
+totem-plugins
+transmission-common
+cheese-common
+gnome-todo-common
+libgnome-todo
+gnome-video-effects
+libcheese-gtk25
+libcheese8
+uno-libs3
+ure
+zeitgeist-core
+hunspell-de-at-frami
+hunspell-de-ch-frami
+hunspell-de-de-frami
+hunspell-en-au
+hunspell-en-ca
+hunspell-en-gb
+hunspell-en-za
+hunspell-es
+hunspell-fr
+hunspell-fr-classical
+hunspell-it
+hunspell-pt-br
+hunspell-pt-pt
+hunspell-ru
+hyphen-de
+hyphen-en-ca
+hyphen-en-gb
+hyphen-en-us
+hyphen-fr
+hyphen-hr
+hyphen-it
+hyphen-pl
+hyphen-pt-br
+hyphen-pt-pt
+hyphen-ru
+mythes-de
+mythes-de-ch
+mythes-en-au
+mythes-en-us
+mythes-fr
+mythes-it
+mythes-pt-pt
+mythes-ru  
diff --git a/development b/development
new file mode 100644
index 0000000..47142b5
--- /dev/null
+++ b/development
@@ -0,0 +1,85 @@
+<<<<<<< development
+=======
+Moved from desktop:
+
+ * python3-apt               # MRS, we need to be able to interact with APT
+ * python3-crypto            # MRS, very useful even though it's very specific
+ * python3-examples          # MRS, 
+ * python3-geoip
+ * python3-imaging-sane
+ * python3-pycurl
+ * python3-mysqldb
+ * python3-newt
+ * python3-pam
+ * python3-pexpect
+ * python3-pylibacl
+ * python3-pyxattr
+ * python3-reportlab
+ * python3-xdg                   # SebastienBacher
+ * python3-lxml
+
+Python 3 libraries with sources already in main
+
+ * python3-polib
+ * python3-requests
+ * python3-pyudev
+ * python3-feedparser
+ * python3-bson
+ * python3-gridfs
+ * python3-pymongo
+ * python3-fixtures
+ * python3-json-patch
+ * python3-webob
+ * python3-stevedore
+ * python3-iso8601
+ * python3-jsonschema
+ * python3-testrepository
+ * python3-configglue
+ * python3-packagekit
+ * python3-pep8
+ * python3-itsdangerous
+ * python3-bs4
+ * python3-cmd2
+ * python3-msgpack
+ * python3-amqp
+ * python3-cliff
+ * python3-waitress
+ * python3-prettytable
+ * python3-astroid
+ * python3-genshi
+ * python3-logilab-common
+ * python3-pexpect
+ * python3-imaging
+ * python3-nine
+ * python3-psutil
+ * python3-scripttest
+ * python3-webtest
+ * python3-sqlalchemy-ext
+
+Extra GCC packages
+
+ * g++-multilib  # seed it directly until changing the defaults
+ * cpp-doc
+ * gcc-doc
+
+Ability to cleanly build packages
+
+ * schroot
+ * sbuild
+
+Cross Toolchains
+
+ * crossbuild-essential-arm64
+ * crossbuild-essential-armhf
+ * crossbuild-essential-powerpc
+ * crossbuild-essential-ppc64el
+
+Additional supported languages
+
+ * golang
+
+# Packages should be recorded in their reverse-built-dependencies using
+# 'Built-Using' due to code copied into target objects at build time.
+= Built-using workarounds =
+ * drac-dev
+>>>>>>> development
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 c9913d9..7353763 100644
--- a/installer
+++ b/installer
@@ -1,3 +1,4 @@
+<<<<<<< installer
 This list was originally constructed based on a [http://people.debian.org/~cjwatson/d-i/ list of packages in the current d-i netinst images], and from initrd.list files in d-i daily builds.
 
 = Common Packages =
@@ -205,3 +206,5 @@ This list was originally constructed based on a [http://people.debian.org/~cjwat
 == s390x ==
 
  * linux-udebs-generic [s390x]
+=======
+>>>>>>> installer
diff --git a/lamp-server b/lamp-server
new file mode 100644
index 0000000..244694c
--- /dev/null
+++ b/lamp-server
@@ -0,0 +1,13 @@
+<<<<<<< lamp-server
+=======
+Task-Section: server
+Task-Description: LAMP server
+Task-Extended-Description: Selects a ready-made Linux/Apache/MySQL/PHP server.
+Task-Key: apache2 mysql-server
+
+ * apache2
+ * apache2-mpm-prefork
+ * php-mysql
+ * libapache2-mod-php
+ * mysql-server
+>>>>>>> lamp-server
diff --git a/languages/STRUCTURE b/languages/STRUCTURE
new file mode 100644
index 0000000..9d11b21
--- /dev/null
+++ b/languages/STRUCTURE
@@ -0,0 +1,16 @@
+desktop-en: desktop-minimal-en
+desktop-minimal-en:
+desktop-es: desktop-minimal-es
+desktop-minimal-es:
+desktop-de: desktop-minimal-de
+desktop-minimal-de:
+desktop-fr: desktop-minimal-fr
+desktop-minimal-fr:
+desktop-it: desktop-minimal-it
+desktop-minimal-it:
+desktop-pt: desktop-minimal-pt
+desktop-minimal-pt:
+desktop-ru: desktop-minimal-ru
+desktop-minimal-ru:
+desktop-zh: desktop-minimal-zh
+desktop-minimal-zh:
diff --git a/languages/desktop-de b/languages/desktop-de
new file mode 100644
index 0000000..0ba6a63
--- /dev/null
+++ b/languages/desktop-de
@@ -0,0 +1,24 @@
+
+# Dictionaries for LibreOffice
+## hyphenation and thesaurus
+ * Language: de
+ * hyphen-${Language}
+ * mythes-${Language}
+ * mythes-de-ch
+
+## hunspell german frami variant dict (more complete)
+ * Languages: de-at de-ch de-de
+ * hunspell-${Languages}-frami
+
+# Other Dictionary
+ * wngerman
+ * wogerman
+ * wswiss
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * libreoffice-l10n-${Language}
+ * libreoffice-help-${Language}
+
+## Thunderbird
+ * thunderbird-locale-${Language}
diff --git a/languages/desktop-en b/languages/desktop-en
new file mode 100644
index 0000000..ceaf861
--- /dev/null
+++ b/languages/desktop-en
@@ -0,0 +1,27 @@
+# Dictionaries for LibreOffice
+## hyphenation and thesaurus
+ * Languages: en-us en-ca en-gb
+ * hyphen-${Languages}
+
+ * Languages: en-us en-au
+ * mythes-${Languages}
+
+## hunspell dict
+ * Languages: en-au en-ca en-gb en-us en-za
+ * hunspell-${Languages}
+
+# Other Dictionaries
+ * wamerican
+ * wbritish
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * Language: en-gb
+ * libreoffice-l10n-${Language}
+ * libreoffice-help-${Language}
+ * libreoffice-l10n-en-za
+ * libreoffice-help-en-us
+
+## Thunderbird
+ * Languages: en en-gb en-us
+ * thunderbird-locale-${Languages}
diff --git a/languages/desktop-es b/languages/desktop-es
new file mode 100644
index 0000000..9f60703
--- /dev/null
+++ b/languages/desktop-es
@@ -0,0 +1,16 @@
+# Dictionaries for LibreOffice
+## hunspell dict
+ * Language: es
+ * hunspell-${Language}
+
+# Other Dictionaries
+ * wspanish
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * libreoffice-l10n-${Language}
+ * libreoffice-help-${Language}
+
+## Thunderbird
+ * Languages: es es-ar es-es
+ * thunderbird-locale-${Languages}
diff --git a/languages/desktop-fr b/languages/desktop-fr
new file mode 100644
index 0000000..ca278d0
--- /dev/null
+++ b/languages/desktop-fr
@@ -0,0 +1,19 @@
+# Dictionaries for LibreOffice
+## hyphenation and thesaurus
+ * Language: fr
+ * hyphen-${Language}
+ * mythes-${Language}
+
+## hunspell dict
+ * hunspell-${Language}
+
+# Other Dictionaries
+ * wfrench
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * libreoffice-l10n-${Language}
+ * libreoffice-help-${Language}
+
+## Thunderbird
+ * thunderbird-locale-${Language}
diff --git a/languages/desktop-it b/languages/desktop-it
new file mode 100644
index 0000000..c4a15fa
--- /dev/null
+++ b/languages/desktop-it
@@ -0,0 +1,19 @@
+# Dictionaries for LibreOffice
+## hyphenation and thesaurus
+ * Language: it
+ * hyphen-${Language}
+ * mythes-${Language}
+
+## hunspell dict
+ * hunspell-${Language}
+
+# Other Dictionaries
+ * witalian
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * libreoffice-l10n-${Language}
+ * libreoffice-help-${Language}
+
+## Thunderbird
+ * thunderbird-locale-${Language}
diff --git a/languages/desktop-minimal-de b/languages/desktop-minimal-de
new file mode 100644
index 0000000..1292896
--- /dev/null
+++ b/languages/desktop-minimal-de
@@ -0,0 +1,11 @@
+# Default languages for most applications we ship by default
+ * Language: de
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-getting-started-docs-${Language}
+ * gnome-user-docs-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-en b/languages/desktop-minimal-en
new file mode 100644
index 0000000..1590f9a
--- /dev/null
+++ b/languages/desktop-minimal-en
@@ -0,0 +1,7 @@
+# Default languages for most applications we ship by default
+ * Language: en
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-es b/languages/desktop-minimal-es
new file mode 100644
index 0000000..cb638fb
--- /dev/null
+++ b/languages/desktop-minimal-es
@@ -0,0 +1,11 @@
+# Default languages for most applications we ship by default
+ * Language: es
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-getting-started-docs-${Language}
+ * gnome-user-docs-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-fr b/languages/desktop-minimal-fr
new file mode 100644
index 0000000..1eec65c
--- /dev/null
+++ b/languages/desktop-minimal-fr
@@ -0,0 +1,11 @@
+# Default languages for most applications we ship by default
+ * Language: fr
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-getting-started-docs-${Language}
+ * gnome-user-docs-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-it b/languages/desktop-minimal-it
new file mode 100644
index 0000000..d8e554a
--- /dev/null
+++ b/languages/desktop-minimal-it
@@ -0,0 +1,11 @@
+# Default languages for most applications we ship by default
+ * Language: it
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-getting-started-docs-${Language}
+ * gnome-user-docs-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-pt b/languages/desktop-minimal-pt
new file mode 100644
index 0000000..e8fdf06
--- /dev/null
+++ b/languages/desktop-minimal-pt
@@ -0,0 +1,11 @@
+# Default languages for most applications we ship by default
+ * Language: pt
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-getting-started-docs-${Language}
+ * gnome-user-docs-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-ru b/languages/desktop-minimal-ru
new file mode 100644
index 0000000..24586aa
--- /dev/null
+++ b/languages/desktop-minimal-ru
@@ -0,0 +1,11 @@
+# Default languages for most applications we ship by default
+ * Language: ru
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-getting-started-docs-${Language}
+ * gnome-user-docs-${Language}
+
+# Firefox
+ * firefox-locale-${Language}
diff --git a/languages/desktop-minimal-zh b/languages/desktop-minimal-zh
new file mode 100644
index 0000000..c522c55
--- /dev/null
+++ b/languages/desktop-minimal-zh
@@ -0,0 +1,23 @@
+# Default languages for most applications we ship by default
+ * Language: zh-hans
+ * language-pack-${Language}
+ * language-pack-gnome-${Language}
+
+# GNOME Help
+ * gnome-user-docs-zh-hans
+
+# Firefox
+ * firefox-locale-${Language}
+
+== Input methods ==
+ * ibus-chewing
+ * ibus-m17n
+ * ibus-libpinyin
+ * ibus-table-cangjie
+ * ibus-table-quick-classic
+ * ibus-table-wubi
+
+== Fonts (zh-hans) ==
+ * fonts-noto-cjk
+ * fonts-arphic-uming
+ * fonts-arphic-ukai
\ No newline at end of file
diff --git a/languages/desktop-pt b/languages/desktop-pt
new file mode 100644
index 0000000..d39a8e3
--- /dev/null
+++ b/languages/desktop-pt
@@ -0,0 +1,24 @@
+# Dictionaries for LibreOffice
+## hyphenation and thesaurus
+ * Language: pt-pt
+ * hyphen-${Language}
+ * hyphen-pt-br
+ * mythes-${Language}
+
+## hunspell dict
+ * Languages: pt-br pt-pt
+ * hunspell-${Languages}
+
+# Other Dictionaries
+ * wportuguese
+ * wbrazilian
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * Languages: pt pt-br
+ * libreoffice-l10n-${Languages}
+ * libreoffice-help-${Languages}
+
+## Thunderbird
+ * Languages: pt pt-br pt-pt
+ * thunderbird-locale-${Languages}
diff --git a/languages/desktop-ru b/languages/desktop-ru
new file mode 100644
index 0000000..2e043c8
--- /dev/null
+++ b/languages/desktop-ru
@@ -0,0 +1,16 @@
+# Dictionaries for LibreOffice
+## hyphenation and thesaurus
+ * Language: ru
+ * hyphen-${Language}
+ * mythes-${Language}
+
+## hunspell dict
+ * hunspell-${Language}
+
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * libreoffice-l10n-${Language}
+ * libreoffice-help-${Language}
+
+## Thunderbird
+ * thunderbird-locale-${Language}
diff --git a/languages/desktop-zh b/languages/desktop-zh
new file mode 100644
index 0000000..8e88ea4
--- /dev/null
+++ b/languages/desktop-zh
@@ -0,0 +1,9 @@
+# Default apps having separates translations
+## Libreoffice l10n and help
+ * Languages: zh-cn zh-tw
+ * libreoffice-l10n-${Languages}
+ * libreoffice-help-${Languages}
+
+## Thunderbird
+ * Languages: zh-cn zh-hans zh-tw
+ * thunderbird-locale-${Languages}
diff --git a/live b/live
new file mode 100644
index 0000000..146b95b
--- /dev/null
+++ b/live
@@ -0,0 +1,35 @@
+<<<<<<< live
+=======
+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 desktop-default-languages
+
+
+== Input methods ==
+
+Input methods for non-default languages included in live
+
+ * gtk-im-libthai
+ * ibus-hangul
+ * ibus-mozc
+ * ibus-unikey
+
+== Ubiquity components ==
+
+These packages make up the Ubiquity live installer.
+
+ * ubiquity-frontend-gtk
+ * ubiquity-ubuntu-artwork
+ * ubiquity-slideshow-ubuntu
+
+== Misc ==
+
+ * gparted
+ * cifs-utils # Needed by casper for CIFS root=
+
+>>>>>>> live
diff --git a/mail-server b/mail-server
new file mode 100644
index 0000000..a6b0be9
--- /dev/null
+++ b/mail-server
@@ -0,0 +1,17 @@
+<<<<<<< mail-server
+=======
+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.
+>>>>>>> mail-server
diff --git a/minimal b/minimal
index df3f8e1..60daf67 100644
--- a/minimal
+++ b/minimal
@@ -1,3 +1,4 @@
+<<<<<<< minimal
 Task-Section: user
 Task-Relevance: 9
 Task-Description: Minimal base system
@@ -62,3 +63,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/openssh-server b/openssh-server
new file mode 100644
index 0000000..286060b
--- /dev/null
+++ b/openssh-server
@@ -0,0 +1,10 @@
+<<<<<<< openssh-server
+=======
+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
+>>>>>>> openssh-server
diff --git a/print-server b/print-server
new file mode 100644
index 0000000..d037365
--- /dev/null
+++ b/print-server
@@ -0,0 +1,15 @@
+<<<<<<< print-server
+=======
+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
+ * printer-driver-gutenprint
+ * foomatic-db-compressed-ppds
+ * printer-driver-hpijs
+ * openprinting-ppds
+>>>>>>> print-server
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/samba-server b/samba-server
new file mode 100644
index 0000000..4834f8b
--- /dev/null
+++ b/samba-server
@@ -0,0 +1,17 @@
+<<<<<<< samba-server
+=======
+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-winbind
+ * libnss-winbind
+ * samba
+ * samba-doc
+ * smbclient
+ * cifs-utils
+ * winbind
+
+>>>>>>> samba-server
diff --git a/server b/server
new file mode 100644
index 0000000..5dc0a5b
--- /dev/null
+++ b/server
@@ -0,0 +1,65 @@
+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 =
+
+ * apport # LP: #424051
+ * at
+ * byobu
+ * curl
+ * git # LP: 1394756
+ * net-tools
+ * patch
+ * pollinate			# Seed the PRNG
+ * screen
+ * software-properties-common # LP: #439566
+ * tmux				# Share/detach sessions
+ * vim
+ * wget				# Fetch data from the command line
+
+= Network =
+
+ * ethtool			# Essential network diagnostics
+
+= Maintenance =
+
+ * update-notifier-common
+
+= Block Device and Filesystem =
+
+ * lvm2				# Needed by MAAS images
+ * mdadm			# Used by many physical machines
+ * multipath-tools              # server-ship/server-live ship multipath-tools-boot, but we need multipath-tools everywhere else.
+ * (open-iscsi)			# Needed by MAAS images, but be removable LP: #1630946
+ * bcache-tools				# Used by MAAS images, when possible
+ * btrfs-progs				# Commonly used server filesystem
+ * xfsprogs				# Commonly used server filesystem
+
+= Debugging and Diagnostics =
+
+ * htop
+ * sosreport				# LP: #1311274, troubleshooting for Ubuntu Advantage support
+
+= Initramfs Modules =
+
+ * cloud-initramfs-copymods		# Needed by MAAS images
+ * cloud-initramfs-dyn-netconf		# Needed by MAAS images (LP: #1750851)
+ * overlayroot			# Needed by MAAS
+
+= Other =
+
+ * ubuntu-server		# metapackage for everything in this task
+ * cloud-guest-utils		# growpart (resize partitions)
+ * fonts-ubuntu-console		# Part of the Ubuntu server experience
+ * snap:lxd					# Every Ubuntu server can host 100x containers
+ * open-vm-tools			# Only needed for Ubuntu as VMware guests
+ * (snapd)
+ * s390-tools [s390x]           # needed for z block devices, bootloader, encryption features, etc.
+ * gnupg
+ * dirmngr
+ * (landscape-common) # LP: #1756261, recommends to be removable for minimal (LP: #1763182)
diff --git a/server-ship b/server-ship
new file mode 100644
index 0000000..7630f69
--- /dev/null
+++ b/server-ship
@@ -0,0 +1,278 @@
+<<<<<<< server-ship
+=======
+= 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
+ * Signed-Kernel-Stem: linux-signed linux-signed-image
+
+== i386 ==
+
+ * ${Kernel-Stem}-virtual [i386]
+ * linux-headers-virtual [i386]
+
+== powerpc ==
+
+ * ${Kernel-Stem}-powerpc-smp [powerpc]
+ * linux-headers-powerpc-smp [powerpc]
+
+== ppc64el ==
+
+ * ${Kernel-Stem}-generic [ppc64el]
+ * linux-headers-generic [ppc64el]
+ * ${Kernel-Stem}-virtual [ppc64el]
+ * linux-headers-virtual [ppc64el]
+ * opal-prd [ppc64el] # for OpenPOWER machines LP: #1555904 LP: #1691557
+
+== s390x ==
+
+ * ${Kernel-Stem}-generic [s390x]
+ * linux-headers-generic [s390x]
+ * ${Kernel-Stem}-virtual [s390x]
+ * linux-headers-virtual [s390x]
+
+== amd64 ==
+
+ * ${Kernel-Stem}-server [amd64]
+ * linux-headers-server [amd64]
+ * ${Kernel-Stem}-virtual [amd64]
+ * linux-headers-virtual [amd64]
+
+ * ${Signed-Kernel-Stem}-generic [amd64]
+
+= From Ship =
+
+ * ssh
+ * chrony # ntpd replaced by chrony >=18.04 (LP: #1744072)
+ * bsd-mailx
+ * mutt
+ * build-essential
+ * fakeroot
+ * devscripts
+ * setserial
+
+= Cluster =
+
+ * ocfs2-tools
+ * libaio1
+ * libaio-dev
+ * ipvsadm
+ * keepalived
+ * multipath-tools-boot
+ * pacemaker
+ * heartbeat
+
+= Servers and Daemons =
+
+Database:
+
+ * mysql-client
+ * mysql-server
+ * postgresql
+ * postgresql-client
+ * postgresql-doc
+
+Proxy:
+
+ * squid # RobertCollins for squid generally, JamieStrandboge for squid3 (LP: #885283), AndreasHasenack back to squid (LP: #1780944)
+
+LDAP:
+
+ * slapd
+ * ldap-utils
+
+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-auth-plain     # FabioMassimoDiNitto
+ #* libapache2-modsecurity       # FabioMassimoDiNitto
+ * libapache-mod-auth-kerb	 # ChuckShort
+
+PHP:
+
+ * libapache2-mod-php
+ * php-pear
+ * php-cgi
+ * php-cli
+ * php-curl
+ * php-gd
+ * php-gmp
+ * php-ldap
+ * php-mysql
+ * php-odbc
+ * php-pgsql
+ * php-pspell
+ * php-recode
+ * php-snmp
+ * php-sqlite3
+ * php-tidy
+ * php-xmlrpc
+ * php-xml
+ * php
+
+Email:
+
+ * dovecot-imapd
+ * dovecot-pop3d
+ * 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
+ * openprinting-ppds
+ * printer-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
+ * nbd-server
+ * open-iscsi # ChuckShort
+ * open-iscsi-udeb # SorenHansen
+ * drbd-utils # ChuckShort - ServerPackageReview
+ * nut # ChuckShort - ServerPackageReview
+ * nut-cgi
+ * nut-snmp
+ * openvpn #ChuckShort - ServerPackageReview
+ * netcat-openbsd
+ * libpkcs11-helper1
+ * zip #ChuckShort - server-lucid-seeds
+ * tdb-tools #ChuckShort - server-lucid-seeds
+ * acl #ChuckShort - server-lucid-seeds
+ * maas
+ * maas-region-udeb
+ * maas-rack-udeb
+ * maas-enlist
+ * maas-enlist-udeb
+ * open-vm-tools #utlemming
+
+Utilities:
+
+ * numactl		  # LP: #1700826
+ * pciutils		  # kirkland added at the request of onsite hardware enablement (manjo)
+
+= Network =
+
+ * nmap                   # network diagnostics
+ * dnstracer              # dns network diagnostics
+ * ifupdown               # (old) high level tools to configure network interfaces
+ * iptraf                 # For smooth upgrades from 16.04, can be dropped in 18.10
+ * iptraf-ng              # sysadmin's toy, may be a candidate for removal
+ * pptpd                  # server that allows setup of Microsoft-compatible VPN
+ * strongswan-starter     # 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
+ * iputils-arping         # would have made elmo's life easier at debconf 4
+ * ppp                    # ppp utilities useful to be on a CD when someone needs them
+ * pppconfig
+ * pppoeconf
+ * wireless-tools
+ * wpasupplicant
+
+IPv6 tools:
+
+ * radvd                  # FabioMassimoDiNitto
+
+Security:
+
+ * checksecurity          # JamesTroup, from Hoglet
+ * aide                   # JamesTroup, from Hoglet
+
+= System Administration Tools =
+
+ * attr                 # will move to base if we go to selinux
+ * quota
+ * 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
+ * libcap2-bin
+ * sasl2-bin
+ * autofs5
+ * acct
+ * siege
+ * smartmontools   # hard disk diagnostics
+ * logwatch	   # ChuckShort - ServerPackageReview
+ * lsscsi	# ChuckShort
+ * sysstat	# ChuckShort - ServerPackageReview
+ * openipmi     # ChuckShort - ServerPackageReview
+ * unattended-upgrades
+ * update-motd # RickClark
+ * landscape-client # RickClark
+
+= Virtualisation =
+
+ * qemu-kvm
+ * qemu-system-x86 [i386 amd64]
+ * qemu-system-ppc [powerpc ppc64el]
+ * qemu-system-aarch64 [arm64]
+ * qemu-system-s390x [s390x]
+ * python3-libvirt
+ * libvirt-bin
+
+== Miscellaneous ==
+
+ * checkbox-ng # roadmr
+ * apport # MathiasGug
+ * kerneloops # JamesWestby
+ * memtest86+
+
+= From desktop =
+
+ * bc
+ * screen
+ * lftp
+ * zip
+ * unzip                # also used for .zip support in file-roller
+
+= Installer =
+
+ * live-installer
+ * oem-config-debconf
+ * partman-iscsi
+
+== Blacklist ==
+
+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
+
+ * !libavcodec*
+>>>>>>> server-ship
diff --git a/server-ship-live b/server-ship-live
new file mode 100644
index 0000000..101499a
--- /dev/null
+++ b/server-ship-live
@@ -0,0 +1,43 @@
+= Kernel =
+
+== generic ==
+ * linux-generic
+ * opal-prd [ppc64el] # for OpenPOWER machines LP: #1555904 LP: #1691557
+
+= OpenSSH server =
+
+The security team's position has always been that installing openssh should be
+opt-in, so that it is clear to the person performing the installation that ssh
+will be active. And so it is necessary to have openssh-server in the pool so
+that it can be installed if the user opts into it.
+
+ * openssh-server
+
+= Curtin =
+
+These packages may be installed dynamically by curtin based on
+installation parameters. They should generally be made available on
+curtin based CDs.
+
+== curtin block/deps.py ==
+
+ * bcache-tools
+ * btrfs-tools
+ * e2fsprogs
+ * jfsutils
+ * lvm2
+ * mdadm
+ * ntfs-3g
+ * open-iscsi
+ * reiserfsprogs
+ * xfsprogs
+ * zfs-initramfs
+ * zfsutils-linux
+
+== curtin curthooks.py ==
+
+ * multipath-tools-boot
+ * s390-tools
+ * grub-efi
+ * grub-efi-arm64
+ * shim-signed
diff --git a/ship b/ship
new file mode 100644
index 0000000..d09bade
--- /dev/null
+++ b/ship
@@ -0,0 +1,68 @@
+<<<<<<< ship
+=======
+== Kernel ==
+
+ * linux-generic [amd64 i386 ppc64el arm64 s390x]
+
+== Server ==
+
+ * ssh
+ * nfs-kernel-server   # need an NFS server
+ * open-iscsi
+ * open-iscsi-udeb
+
+== Networking ==
+
+ * bsd-mailx
+
+== Common UNIX stuff ==
+
+ * nfs-common		  # allows people to access NFS filesystems
+ # * vim                    # vim-tiny is in minimal; vim includes syntax highlighting, help files, etc.
+
+== Hardware & Network Access ==
+
+ * pptp-linux             # client for Microsoft-compatible VPN's, needed for some ISPs
+
+ * libatm1	# suggested by ppp for PPP-over-ATM
+ * setserial	# needed by folks with nonstandard serial ports
+ * b43-fwcutter
+ * sosreport
+
+== Common language packs ==
+
+ * Languages: en
+ * language-pack-${Languages}
+ * language-pack-gnome-${Languages}
+
+ # no space on powerpc
+ * Languages: es
+ * language-pack-${Languages} [i386 amd64 amd64+mac]
+ * language-pack-gnome-${Languages} [i386 amd64 amd64+mac]
+
+# subset of English language support which we want by default:
+ * firefox-locale-en
+ * libreoffice-help-en-us [i386 amd64 amd64+mac]
+ * hunspell-en-us
+ * hyphen-en-gb
+
+== Installer ==
+
+ * bootstrap-base
+ * oem-config-gtk
+ * oem-config-slideshow-ubuntu
+ * uboot-mkimage [armel]
+ * partman-iscsi
+
+== 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*
+>>>>>>> ship
diff --git a/ship-live b/ship-live
new file mode 100644
index 0000000..3f16fe7
--- /dev/null
+++ b/ship-live
@@ -0,0 +1,35 @@
+<<<<<<< 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 ==
+
+ * 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
+ * mouseemu	# needed on Macs with single-button mice
+ * b43-fwcutter
+ * bcmwl-kernel-source #since we no longer have LRM
+
+== Installer ==
+
+ * grub-efi [amd64]
+ * grub-efi-amd64-signed [amd64]
+ * 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 a35a9a0..652ee6d 100644
--- a/standard
+++ b/standard
@@ -1,3 +1,4 @@
+<<<<<<< standard
 Task-Section: user
 Task-Relevance: 8
 Task-Description: Standard system
@@ -87,3 +88,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..53e53fc
--- /dev/null
+++ b/supported
@@ -0,0 +1,217 @@
+<<<<<<< supported
+=======
+This seed includes some things that are too big for a DVD, and of course also
+inherits from everything else.
+
+= Language support =
+
+ * /^language-pack-[^-]+$/
+ * /^language-pack-gnome-[^-]+$/
+ * /^language-pack-gnome-zh-han/
+ * /^language-pack-zh-han/
+
+The following packages also have application translations, but are not
+using gettext, but a custom format. language-selector will install
+them as appropriate.
+
+ * /^libreoffice-help-/
+ * /^libreoffice-l10n-/
+ * /^thunderbird-locale-/
+ * /^firefox-locale-/
+ * /^gnome-user-docs-/
+ * /^gnome-getting-started-docs-/
+ * poppler-data
+
+The following input aids are also installed on demand by
+language-selector:
+
+ * libenchant-voikko
+ * libreoffice-voikko
+ * mozvoikko
+ * tmispell-voikko
+ * /^hyphen-..$/
+ * /^hyphen-en-..$/
+ * /^mythes-/
+ * /^hunspell-[^-]*$/
+ * /^hunspell-de-..-frami/
+ * /^hunspell-..-..$/
+
+myspell packages containing the hunspell dictionaries:
+
+ * Languages: eo et fa fo ga gv hy ku nr ns ss st tn ts ve xh zu
+ * myspell-${Languages}
+
+Other dictionaries, word lists, and thesauri:
+
+ * dict-foldoc
+ * dict-gcide
+ * dict-jargon
+ * dict-moby-thesaurus
+ * dict-vera
+ * dictd
+ * 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-beng
+ * fonts-deva
+ * fonts-farsiweb
+ * fonts-gujr
+ * fonts-guru
+ * fonts-indic
+ * fonts-kacst
+ * fonts-khmeros
+ * fonts-knda
+ * fonts-lao
+ * fonts-lklug-sinhala
+ * fonts-manchufont
+ * fonts-mlym
+ * fonts-nafees
+ * fonts-noto-cjk
+ * fonts-noto-cjk-extra
+ * fonts-orya
+ * fonts-sil-abyssinica
+ * fonts-sil-ezra
+ * fonts-sil-nuosusil
+ * fonts-sil-padauk
+ * fonts-sil-scheherazade
+ * fonts-taml
+ * fonts-telu
+ * fonts-tibetan-machine
+ * fonts-thai-tlwg
+ * fonts-ukij-uyghur
+
+= Installed on demand =
+
+ * apparmor-utils    # AppArmor profile development
+ * apparmor-notify   # LP: #893266
+ * apparmor-profiles
+ * libapache2-mod-apparmor
+ * libpam-apparmor
+ * python3-libapparmor
+ * auditd
+
+= Transistional Pacakages for Upgrades from 18.04 =
+
+ * squid3
+
+= Transistional Pacakages for Upgrades from 16.04 =
+
+ * libcomerr2
+ * e2fslibs
+
+= Rescued from Extra =
+
+ * Extra-Include: *-dbg *-debug *-dev *-doc *-docs 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.[4-9]*
+ * Extra-Exclude: libgnat*-dev libgnat*-dbg gnat*-doc
+ * Extra-Exclude: gfortran-[0-9]*-doc
+ * Extra-Exclude: lib*go[0-9]*-dbg
+ * Extra-Exclude: lib*objc[0-9]*-dbg
+ * Extra-Exclude: libgcj[0-9]*-dbg libgcj[0-9]*-dev
+ * Extra-Exclude: lib*gphobos[0-9]*-dbg lib*gphobos[0-9]*-dev
+ * Extra-Exclude: gcc-8-doc gfortran-8-doc cpp-8-doc libgccjit-8-doc
+ * Extra-Exclude: gcc-8-plugin-dev
+ * Extra-Exclude: lib*gfortran-8-dev lib*gfortran5-dbg
+ * Extra-Exclude: lib*stdc++-8-dev lib*stdc++6-8-dbg
+ * Extra-Exclude: lib*gcc-8-dev libhsail-rt-8-dev lib*objc-8-dev
+ * Extra-Exclude: lib*ubsan1-dbg
+ * Extra-Exclude: binutils-alpha-linux-gnu-dbg binutils-arm-linux-gnueabi-dbg binutils-hppa-linux-gnu-dbg binutils-hppa64-linux-gnu-dbg binutils-m68k-linux-gnu-dbg binutils-mips-linux-gnu-dbg binutils-mips64-linux-gnuabi64-dbg binutils-mips64-linux-gnuabin32-dbg binutils-mips64el-linux-gnuabi64-dbg binutils-mips64el-linux-gnuabin32-dbg binutils-mipsel-linux-gnu-dbg binutils-powerpc-linux-gnuspe-dbg binutils-powerpc64-linux-gnu-dbg binutils-sh4-linux-gnu-dbg binutils-sparc64-linux-gnu-dbg binutils-mipsisa32r6-linux-gnu-dbg binutils-mipsisa32r6el-linux-gnu-dbg binutils-mipsisa64r6-linux-gnuabi64-dbg binutils-mipsisa64r6-linux-gnuabin32-dbg binutils-mipsisa64r6el-linux-gnuabi64-dbg binutils-mipsisa64r6el-linux-gnuabin32-dbg binutils-ia64-linux-gnu-dbg binutils-riscv64-linux-gnu-dbg
+ * Extra-Exclude: lldb-* liblldb-* clang* libclang* libllvm-* libfuzzer-* liblld-* libomp-* lld-* libc++-* libc++abi-* llvm-*
+ * Extra-Exclude: libavformat-dev libpostproc-dev
+ * Extra-Exclude: libnetpbm9-dev
+ * Extra-Exclude: libboost-*-dev libboost*-all-dev libboost-doc libboost*-doc
+ * Extra-Exclude: libcdio-*-dev libiso9660-dev
+ * Extra-Exclude: nvidia-glx-legacy-dev # nvidia-glx-legacy is unsupportable
+ * Extra-Exclude: *-cil *-cil-dev # Mono stuff
+ * Extra-Exclude: libappindicator-dev libindicator3-dev libindicator-dev libdbusmenu-gtk-dev # gtk2 versions
+ * Extra-Exclude: gir1.2-appindicator-0.1 gir1.2-dbusmenu-gtk-0.4 # gtk2 versions
+ * Extra-Exclude: libcanberra-gtk-dev libgutenprintui2-dev # pulls in gtk2
+ * Extra-Exclude: libgtk2.0-dev libglade2-dev libgail-dev libgtkmm-2.4-dev gir1.2-gtk-2.0 gtk2.0-examples # pulls in gtk2
+ * Extra-Exclude: libhandy*-dev # pulls in glade LP: #1815483
+ * Extra-Exclude: libnm-gtk-dev libnm-glib-dev libnm-glib-vpn-dev libnm-util-dev gir1.2-nmgtk-1.0 gir1.2-networkmanager-1.0 # Removed from Debian LP: #1389336 LP: #1744619
+ * 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: sendmail-doc # sendmail source is only in main for libmilter
+ * Extra-Exclude: grub-coreboot-dbg grub-emu-dbg
+ * Extra-Exclude: haproxy-doc # https://lists.ubuntu.com/archives/ubuntu-release/2014-July/002967.html
+ * Extra-Exclude: imagemagick-6-doc imagemagick-doc # LP: #1667150
+ * Extra-Exclude: libfftw3-mpi-dev
+ * Extra-Exclude: thunderbird-gnome-support-dbg # Unity support additions
+ * Extra-Exclude: libturbojpeg0-dev # legacy API not for main
+ * Extra-Exclude: libappstreamqt-dev libgpgmepp-dev libpoppler-qt5-dev libsnapd-qt-dev gstreamer1.0-plugins-good-dbg # don't pull in Qt
+ * Extra-Exclude: rrdtool-dbg # pulls in rrdtool-tcl & tcl/tk
+ * Extra-Exclude: libblockdev-lvm-dev # pulls in thin-provisioning-tools, no MIR yet
+ * Extra-Exclude: libblockdev-btrfs-dev libblockdev-kbd-dev libblockdev-mdraid-dev libblockdev-vdo-dev # pulls in libbytesize, no MIR yet
+ * Extra-Exclude: libblockdev-nvdimm-dev # pulls in ndctl
+ * Extra-Exclude: libu2f-host-dev libu2f-host-doc # we actually just want the udev rules for U2F devices
+ * Extra-Exclude: golang-github-ubuntu-ubuntu-report-dev # we only want the ubuntu-report binary
+ * Extra-Exclude: emacs-lucid-dbg
+ * Extra-Exclude: python-markdown-doc  # mkdocs, mkdocs-nature in universe
+ * Extra-Exclude: python-networkx-doc # too many universe deps
+ * Extra-Exclude: dpdk-dev libdpdk-dev # -dev has universe deps e.g. intel-ipsec-mb (Details at LP: #1814060)
+ * Extra-Exclude: libneon27-dev libneon27-dbg # dev package for the unused OpenSSL variant, we use -gnutls variant in main
+ * Extra-Exclude: python-*-dbg python-*-dev
+
+= Build infrastructure =
+
+ * pkgbinarymangler # needs to be in main to stay in the buildd chroots
+
+= Dynamically installed by deja-dup (to avoid python2 on image) =
+
+ * duplicity
+ * python-gi
+
+= Converted to snaps =
+# Especially since we don't convert .deb to snaps on upgrade, let's keep these in main for now:
+
+ * gnome-calculator
+ * gnome-characters
+ * gnome-logs
+ * gnome-system-monitor
+
+= Other =
+
+ * apt-config-icons*
+ * miscfiles
+ * sosreport # AdamStokes LP: #1206106
+ * nvidia-prime
+ * fglrx-pxpress
+ * ipxe
+ * w3m # The One True console web browser, needed to keep doc packages in main
+ * curtin # subiquity needs it; python3-curtin already seeded via maas.
+ * network-manager-openvpn # used by Canonical employees to access our VPN
+
+ * openjdk-11-jdk
+ * openjdk-11-doc
+ * openjdk-11-source
+>>>>>>> supported
diff --git a/supported-desktop-extra b/supported-desktop-extra
new file mode 100644
index 0000000..e0ccf89
--- /dev/null
+++ b/supported-desktop-extra
@@ -0,0 +1,43 @@
+This seed exists only to allow fine tuning the 3y support time
+
+= Dev tools =
+
+ * gnupg
+ * dirmngr
+
+= Documentation =
+ * gnupg-doc
+ * manpages-dev
+ * tar-doc
+
+= Additional multimedia =
+
+ * gstreamer1.0-tools
+
+= Extra desktop =
+
+ * libreoffice-nlpsolver
+ * libreoffice-officebean
+ * libreoffice-style-tango
+ * icc-profiles-free
+ * vim-gnome
+
+== Restricted drivers ==
+
+ * fglrx-amdcccle-updates
+ * fglrx-updates-dev
+ * nvidia-current-updates
+ * nvidia-current-updates-dev
+ * nvidia-settings-updates
+ * /^nvidia-[0-9]+/
+ * /^nvidia-headless-[0-9]+/
+ * /^nvidia-headless-no-dkms-[0-9]+/
+ * /^nvidia-[0-9]+-updates/
+ * /^nvidia-[0-9]+-dev/
+ * /^nvidia-[0-9]+-updates-dev/
+ * /^nvidia-experimental-[0-9]+/
+ * /^nvidia-experimental-[0-9]+-dev/
+ * /^nvidia-settings-experimental-[0-9]+/
+ * /^nvidia-settings-[0-9]+-updates/
+ * /^nvidia-settings-[0-9]+/
+
diff --git a/supported-kiosk b/supported-kiosk
new file mode 100644
index 0000000..ea4e35f
--- /dev/null
+++ b/supported-kiosk
@@ -0,0 +1,6 @@
+This seed exists to keep some items that may be required for the mir
+kiosk / signage project
+
+= Kiosk =
+
+ * libmiral-dev     # keep MIR in main
diff --git a/system-image b/system-image
new file mode 100644
index 0000000..d3bfee6
--- /dev/null
+++ b/system-image
@@ -0,0 +1,46 @@
+Task-Section: user
+Task-Description: Ubuntu Core Next
+Task-Extended-Description: This task provides system image based ubuntu core
+Task-Key: ubuntu-core
+Task-Name: ubuntu-core
+Task-Metapackage: ubuntu-core
+
+ * Feature: no-follow-recommends
+
+= Core =
+ * ubuntu-core-snapd-units
+ * snapd
+ * systemd
+ * openssh-server
+ * xz-utils
+ * iptables
+ * init
+ * initramfs-tools-ubuntu-core
+ * grub-pc [i386]
+ * grub-efi-ia32-bin [i386]
+ * grub-pc-bin [amd64]
+ * grub-efi-amd64-signed [amd64]
+ * grub-xen-bin [amd64 i386]
+ * shim-signed [amd64]
+ * cloud-init
+ * ca-certificates
+ * dbus
+ * libpam-systemd
+ * apparmor
+ * libnss-extrausers
+ * wpasupplicant
+ * rsyslog
+ * seccomp # for scmp_sys_resolver
+ * python3-libapparmor # snappy-debug.security needs matching userspace
+ * isc-dhcp-client
+ * dosfstools
+ * ubuntu-fan
+ * gdbserver
+ * squashfs-tools
+ * fwupdate
+ * fwupdate-signed
+ * ppp
+ * gdisk
+ * libnss-myhostname
+ * crda
+ * netbase
diff --git a/wsl b/wsl
new file mode 100644
index 0000000..bd8aa4c
--- /dev/null
+++ b/wsl
@@ -0,0 +1,17 @@
+Packages needed or useful in Windows Subsystem for Linux (WSL) installations.
+
+The WSL environment is is somewhere between a chroot and a container.
+The Ubuntu installation runs processes in a root file system separate from the
+Windows root file system, but it can interact with the Windows programs sharing
+the network interfaces including localhost and via Unix sockets.
+
+The WSL environment does need tools for setting up boot and does not run systemd
+at the moment.
+
+== Comfortable Unix System ==
+
+# * wslu # needs MIR
+
+= Meta =
+
+ * ubuntu-wsl     # Ubuntu-specific bits we want on every Ubuntu WSL system