Merge ~xnox/ubuntu-seeds:eoan into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:eoan

Proposed by Dimitri John Ledkov on 2019-05-13
Status: Superseded
Proposed branch: ~xnox/ubuntu-seeds:eoan
Merge into: ~ubuntu-core-dev/ubuntu-seeds/+git/platform:eoan
Diff against target: 2171 lines (+1831/-0) (has conflicts)
48 files modified
STRUCTURE (+31/-0)
boot (+3/-0)
build-essential (+3/-0)
cloud-image (+11/-0)
desktop (+65/-0)
desktop-default-languages (+17/-0)
desktop-minimal (+169/-0)
desktop-minimal-default-languages (+17/-0)
desktop.minimal-remove (+190/-0)
development (+85/-0)
doc/langpacks.txt (+17/-0)
installer (+3/-0)
lamp-server (+13/-0)
languages/STRUCTURE (+16/-0)
languages/desktop-de (+24/-0)
languages/desktop-en (+27/-0)
languages/desktop-es (+20/-0)
languages/desktop-fr (+19/-0)
languages/desktop-it (+19/-0)
languages/desktop-minimal-de (+11/-0)
languages/desktop-minimal-en (+7/-0)
languages/desktop-minimal-es (+11/-0)
languages/desktop-minimal-fr (+11/-0)
languages/desktop-minimal-it (+11/-0)
languages/desktop-minimal-pt (+11/-0)
languages/desktop-minimal-ru (+11/-0)
languages/desktop-minimal-zh (+23/-0)
languages/desktop-pt (+24/-0)
languages/desktop-ru (+16/-0)
languages/desktop-zh (+9/-0)
live (+35/-0)
mail-server (+17/-0)
minimal (+3/-0)
openssh-server (+10/-0)
print-server (+15/-0)
required (+3/-0)
samba-server (+17/-0)
server (+65/-0)
server-ship (+277/-0)
server-ship-live (+45/-0)
ship (+69/-0)
ship-live (+35/-0)
standard (+3/-0)
supported (+212/-0)
supported-desktop-extra (+62/-0)
supported-kiosk (+6/-0)
system-image (+46/-0)
wsl (+17/-0)
Conflict in STRUCTURE
Conflict in boot
Conflict in build-essential
Conflict in desktop
Conflict in development
Conflict in doc/langpacks.txt
Conflict in installer
Conflict in lamp-server
Conflict in live
Conflict in mail-server
Conflict in minimal
Conflict in openssh-server
Conflict in print-server
Conflict in required
Conflict in samba-server
Conflict in server-ship
Conflict in ship
Conflict in ship-live
Conflict in standard
Conflict in supported
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team 2019-05-13 Pending
Review via email: mp+367347@code.launchpad.net

Commit message

drop the dynamically installed dejadup from supported.

once the py3 dejadup is available => it will be seeded pre-installed on the desktop image, as it was way back when.

To post a comment you must log in.

Unmerged commits

d5ffedd... by Dimitri John Ledkov on 2019-05-13

'drop it now, yes do it' said will in Lyon.

347fa18... by Christian Ehrhardt  on 2019-05-13

do not auto-promote dpdk-doc (LP: #1814060)

Signed-off-by: Christian Ehrhardt <email address hidden>

2fa4609... by Christian Ehrhardt  on 2019-05-10

server: do not explicitly state fwupd-signed as some arches wont need/have EFI

Signed-off-by: Christian Ehrhardt <email address hidden>

d6bc175... by Christian Ehrhardt  on 2019-05-10

server: unseed net-tools being replaced by iproute2 (LP: #1748956)

Signed-off-by: Christian Ehrhardt <email address hidden>

afd5515... by Christian Ehrhardt  on 2019-05-10

server: add fwupd to server meta

Signed-off-by: Christian Ehrhardt <email address hidden>

a587a68... by Dimitri John Ledkov on 2019-05-09

NetworkManager recommends ppp, and can establish ppp connections.

These days, direct ppp from desktop is very uncommon as most ISPs
provide routers pre-configured with ppp.

Configuring ppp via network-manager is sufficient.

Drop explicit seeding of ppp, pppconfig, pppoeconf.

Bug-Ubuntu: https://launchpad.net/bugs/1766659

e550e0e... by Bryce Harrington on 2019-05-03

Drop heartbeat from server-ship

pacemaker no longer needs the heartbeat package. It is no longer
actively maintained and nothing else requires it. The Server Team has
decided to drop it from main, so drop it from the seed.

LP: #1827416

d07c1d3... by Adam Conrad on 2019-04-18

platform.disco -> platform.eoan; ubuntu.disco -> ubuntu.eoan

3182047... by Steve Langasek on 2019-04-17

Replace fwupdate with fwupd in system-image; LP: #1787254

c98a840... by Colin Watson on 2019-04-17

Move STRUCTURE ordering comment to the end

This might make it easier to spot.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/STRUCTURE b/STRUCTURE
2index ca47542..ff07352 100644
3--- a/STRUCTURE
4+++ b/STRUCTURE
5@@ -1,3 +1,4 @@
6+<<<<<<< STRUCTURE
7 feature follow-recommends
8 feature no-follow-build-depends
9 required:
10@@ -26,3 +27,33 @@ supported-sysadmin-common: standard
11 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
12 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
13 supported-common: supported-server supported-desktop
14+=======
15+include platform.eoan
16+include ubuntu.eoan/languages
17+desktop: desktop-minimal desktop-common
18+desktop-minimal: desktop-common
19+dns-server: standard
20+lamp-server: standard
21+openssh-server: standard
22+print-server: standard
23+samba-server: standard
24+postgresql-server: standard
25+mail-server: standard
26+server: standard
27+server-ship: boot installer dns-server lamp-server openssh-server print-server samba-server postgresql-server mail-server server d-i-requirements
28+server-ship-live: server
29+cloud-image: standard
30+ship: boot installer desktop d-i-requirements
31+live: desktop live-common desktop-default-languages
32+ship-live: boot live
33+development: desktop
34+supported-desktop-extra: desktop live
35+supported-kiosk: desktop
36+system-image: boot
37+wsl: minimal
38+# default language support
39+desktop-default-languages: desktop-minimal-default-languages desktop-en desktop-es desktop-de desktop-fr desktop-it desktop-pt desktop-ru desktop-zh
40+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
41+supported: supported-common server-ship server-ship-live cloud-image ship ship-live development language-packs supported-desktop-extra supported-kiosk
42+# make sure supported remains the last entry
43+>>>>>>> STRUCTURE
44diff --git a/boot b/boot
45index e2687f3..8145909 100644
46--- a/boot
47+++ b/boot
48@@ -1,3 +1,4 @@
49+<<<<<<< boot
50 = Kernels and Bootloaders =
51
52 The default kernels and bootloaders are not to be installed by debootstrap,
53@@ -51,3 +52,5 @@ restricted modules.
54 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 ...)
55
56 * mawk
57+=======
58+>>>>>>> boot
59diff --git a/build-essential b/build-essential
60index f51f613..cc5efb1 100644
61--- a/build-essential
62+++ b/build-essential
63@@ -1,3 +1,4 @@
64+<<<<<<< build-essential
65 * Feature: no-follow-recommends
66
67 This seed is used to implement the debootstrap buildd variant.
68@@ -10,3 +11,5 @@ This seed is used to implement the debootstrap buildd variant.
69 * libc6-dev [!alpha !ia64]
70 * libc6.1-dev [alpha ia64]
71 * make
72+=======
73+>>>>>>> build-essential
74diff --git a/cloud-image b/cloud-image
75new file mode 100644
76index 0000000..6a721a3
77--- /dev/null
78+++ b/cloud-image
79@@ -0,0 +1,11 @@
80+Task-Section: server
81+Task-Description: Ubuntu Cloud Image (instance)
82+Task-Extended-Description: Packages included in Ubuntu Cloud images.
83+Task-Key: cloud-init
84+
85+= Ubuntu Server =
86+ * ubuntu-server
87+
88+= Additional cloud-image only packages =
89+ * cloud-init # Standard Ubuntu cloud boot support (LP: #1576351)
90+ * openssh-server # Standard way to access a server (LP: #1576353)
91diff --git a/desktop b/desktop
92new file mode 100644
93index 0000000..6030285
94--- /dev/null
95+++ b/desktop
96@@ -0,0 +1,65 @@
97+<<<<<<< desktop
98+=======
99+Task-Per-Derivative: 1
100+Task-Section: user
101+Task-Description: Ubuntu desktop
102+Task-Extended-Description: This task provides the Ubuntu desktop environment.
103+Task-Key: ubuntu-desktop
104+Task-Seeds: desktop-minimal desktop-common
105+
106+= GUI infrastructure =
107+
108+Desktop Experience:
109+ * (thunderbird-gnome-support)
110+
111+= Desktop apps =
112+
113+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.
114+
115+ * (thunderbird)
116+ * (transmission-gtk)
117+ * (gnome-todo)
118+ * (baobab)
119+ * (rhythmbox)
120+ * (cheese)
121+ * (totem)
122+ * (vino) # vnc server
123+ * (simple-scan)
124+ * (remmina)
125+ * (shotwell)
126+ * (usb-creator-gtk) [i386 amd64]
127+ * (deja-dup)
128+ * (gnome-calendar)
129+
130+Games: We only ship a few by default.
131+ * (aisleriot)
132+ * (gnome-mahjongg)
133+ * (gnome-mines)
134+ * (gnome-sudoku)
135+ * (branding-ubuntu) # Ubuntu branding for some games
136+
137+Default office suite: libreoffice
138+
139+ * (libreoffice-style-breeze)
140+ * (libreoffice-gnome)
141+ * (libreoffice-writer)
142+ * (libreoffice-calc)
143+ * (libreoffice-impress)
144+ * (libreoffice-math)
145+ * (libreoffice-ogltrans)
146+ * (libreoffice-pdfimport)
147+
148+Others
149+
150+ * (fonts-noto-color-emoji)
151+
152+Custom launchers to be displayed on the Dash by default
153+
154+ * (ubuntu-web-launchers)
155+
156+= Other =
157+
158+ * ubuntu-desktop-minimal # we are a superset of minimal
159+ * ubuntu-desktop # metapackage for everything here
160+ * (example-content)
161+>>>>>>> desktop
162diff --git a/desktop-default-languages b/desktop-default-languages
163new file mode 100644
164index 0000000..f1d45fc
165--- /dev/null
166+++ b/desktop-default-languages
167@@ -0,0 +1,17 @@
168+Task-Per-Derivative: 1
169+Task-Section: user
170+Task-Description: Ubuntu desktop default languages
171+Task-Extended-Description: This task provides the Ubuntu desktop default languages.
172+Task-Key: hyphen-de hyphen-en-us hyphen-es hyphen-fr hyphen-it hyphen-pt-pt hyphen-ru firefox-locale-zh-hans
173+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
174+
175+The full rationale on how we choose the languages and what we install
176+is at https://launchpad.net/bugs/1520278
177+
178+The ones currently installed on the live are:
179+en, es, pt, de, fr, it, ru, zh (simplified)
180+
181+This should install check-language-support --show-installed -l $LANG from
182+default live.
183+
184+For the tasks to appear in tasksel, it needs a Key package, We take the en langpack.
185diff --git a/desktop-minimal b/desktop-minimal
186new file mode 100644
187index 0000000..ef3ac1e
188--- /dev/null
189+++ b/desktop-minimal
190@@ -0,0 +1,169 @@
191+Task-Per-Derivative: 1
192+Task-Section: user
193+Task-Description: Ubuntu minimal desktop
194+Task-Extended-Description: This task provides the Ubuntu desktop minimal environment.
195+Task-Key: ubuntu-desktop-minimal
196+Task-Seeds: desktop-common
197+
198+= Hardware and Architecture Support =
199+
200+== Architecture-independent ==
201+
202+Bluetooth:
203+
204+ * (gnome-bluetooth) # desktop bluetooth support
205+
206+= Network Services =
207+
208+Basic network services, VPN and Windows integration.
209+
210+ * (avahi-autoipd) # IPv4 link-local interface configuration support
211+ * (network-manager)
212+ * (network-manager-config-connectivity-ubuntu)
213+ * (network-manager-pptp-gnome)
214+ * (network-manager-openvpn-gnome)
215+ * (libproxy1-plugin-gsettings)
216+ * (libproxy1-plugin-networkmanager)
217+
218+= GUI infrastructure =
219+
220+ * libnotify-bin # various scripts need notify-send (such as .bashrc's "alert")
221+ * !notification-daemon # gnome-shell provides this feature instead
222+
223+Input methods:
224+
225+ * (im-config)
226+ * (ibus)
227+ * (ibus-gtk)
228+ * (ibus-gtk3)
229+ * (ibus-table)
230+
231+Desktop Experience:
232+ * gnome-shell
233+ * ubuntu-session [!s390x]
234+ * gnome-shell-extension-desktop-icons
235+ * gnome-shell-extension-ubuntu-dock
236+ * gnome-shell-extension-appindicator
237+ * (gir1.2-gmenu-3.0) # LP: #1726093
238+ * (gnome-initial-setup)
239+ * (ubuntu-report)
240+
241+= Desktop apps =
242+
243+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.
244+
245+ * (apport-gtk)
246+ * (whoopsie)
247+ * (eog)
248+ * (file-roller)
249+ * gdm3
250+ * (gedit)
251+ * (app-install-data-partner)
252+ * gnome-settings-daemon
253+ * gnome-control-center
254+ * gnome-menus
255+ * (system-config-printer)
256+ * (gnome-power-manager)
257+ * (gnome-terminal)
258+ * (gnome-screenshot)
259+ * (gnome-font-viewer)
260+ * language-selector-gnome
261+ * (firefox)
262+ * (xul-ext-ubufox)
263+ * nautilus
264+ * (nautilus-sendto)
265+ * (nautilus-share)
266+ * software-properties-gtk
267+ * ubuntu-release-upgrader-gtk
268+ * update-manager
269+ * update-notifier
270+ * yelp
271+ * zenity
272+ * (xdg-desktop-portal-gtk) # Useful for desktop snaps
273+ * (xdg-utils) # useful utilities
274+ * xdg-user-dirs
275+ * xdg-user-dirs-gtk
276+ * pulseaudio
277+ * (pulseaudio-module-bluetooth)
278+ * gvfs-bin # mostly used as xdg-open backend
279+ * (gvfs-fuse) # let non-GNOME apps see GVFS via fuse
280+ * (gnome-disk-utility)
281+ * (evince)
282+
283+ Desktop snaps: these also exist in ubuntu-release-upgrader's DistUpgradeQuirks.py for users who upgrade.
284+ * snap:gnome-3-28-1804
285+ * snap:gtk-common-themes
286+ * snap:gnome-calculator
287+ * snap:gnome-characters
288+ * snap:gnome-logs
289+ * snap:gnome-system-monitor
290+
291+Software center
292+ * (ubuntu-software)
293+ * (gnome-software-plugin-snap)
294+
295+= Key management and signing =
296+
297+ * (gnome-keyring)
298+ * (seahorse)
299+ * (libpam-gnome-keyring)
300+
301+We use gnupg's pinentry support as of wily, instead of gnome-keyring as before.
302+
303+ * (gpg-agent)
304+ * (dirmngr)
305+
306+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.
307+
308+Yaru Theming
309+
310+ * (yaru-theme-gnome-shell)
311+ * (yaru-theme-gtk)
312+ * (yaru-theme-icon)
313+ * (yaru-theme-sound)
314+
315+Wallpapers
316+
317+ * (ubuntu-wallpapers)
318+
319+Others
320+
321+ * gnome-session-canberra # Needed to make login/logout sounds audible.
322+ * dmz-cursor-theme
323+
324+Boot theme
325+
326+ * (plymouth-theme-ubuntu-logo)
327+
328+Settings: we have some settings overrides by default in an unique package.
329+ and provide our ones, like sound settings
330+ * ubuntu-settings
331+ * (gsettings-ubuntu-schemas)
332+
333+The gstreamer1.0 packages we want to install:
334+
335+ * gstreamer1.0-alsa
336+ * gstreamer1.0-plugins-base-apps
337+ * gstreamer1.0-packagekit
338+ * gstreamer1.0-pulseaudio
339+
340+Accessibility tools:
341+
342+ * (gnome-accessibility-themes)
343+ * (orca)
344+ * (brltty)
345+ * (xcursor-themes)
346+ * (speech-dispatcher)
347+ * (mousetweaks)
348+ * at-spi2-core
349+ * libatk-adaptor
350+
351+= Documentation =
352+
353+ * (ubuntu-docs)
354+ * (gnome-getting-started-docs)
355+
356+= Other =
357+
358+ * ubuntu-desktop-minimal # metapackage for everything here
359+ * (libwmf0.2-7-gtk) # provides a gdk-pixbuf loader for WMF images
360diff --git a/desktop-minimal-default-languages b/desktop-minimal-default-languages
361new file mode 100644
362index 0000000..498a5a7
363--- /dev/null
364+++ b/desktop-minimal-default-languages
365@@ -0,0 +1,17 @@
366+Task-Per-Derivative: 1
367+Task-Section: user
368+Task-Description: Ubuntu minimal desktop default languages
369+Task-Extended-Description: This task provides the Ubuntu minimal desktop default languages.
370+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
371+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
372+
373+The full rationale on how we choose the languages and what we install
374+is at https://launchpad.net/bugs/1520278
375+
376+The ones currently installed on the live are:
377+en, es, pt, de, fr, it, ru, zh (simplified)
378+
379+This should install check-language-support --show-installed -l $LANG from
380+default live.
381+
382+For the tasks to appear in tasksel, it needs a Key package, We take the en langpack.
383diff --git a/desktop.minimal-remove b/desktop.minimal-remove
384new file mode 100644
385index 0000000..8b6e9f4
386--- /dev/null
387+++ b/desktop.minimal-remove
388@@ -0,0 +1,190 @@
389+# This is a list of packages to be removed when the 'minimal' option is
390+# selected during installation.
391+
392+# Note that the format is NOT the same as the usual seed format. This file is
393+# not processed by germinate - it is simply downloaded during image builds.
394+
395+# Desktop apps
396+thunderbird
397+transmission-gtk
398+gnome-todo
399+baobab
400+rhythmbox
401+cheese
402+vino
403+shotwell
404+totem
405+usb-creator-gtk
406+deja-dup
407+gnome-calendar
408+remmina
409+simple-scan
410+
411+# Desktop experience
412+thunderbird-gnome-support
413+
414+# Games
415+aisleriot
416+gnome-mahjongg
417+gnome-mines
418+gnome-sudoku
419+branding-ubuntu
420+
421+# Libreoffice
422+libreoffice-style-breeze
423+libreoffice-gnome
424+libreoffice-writer
425+libreoffice-calc
426+libreoffice-impress
427+libreoffice-math
428+libreoffice-ogltrans
429+libreoffice-pdfimport
430+
431+# Others
432+example-content
433+ubuntu-web-launchers
434+fonts-noto-color-emoji
435+
436+# Langpacks (keeping libreoffice and thunderbird installed otherwise)
437+libreoffice-l10n-en-gb
438+libreoffice-l10n-es
439+libreoffice-l10n-zh-cn
440+libreoffice-l10n-zh-tw
441+libreoffice-l10n-pt
442+libreoffice-l10n-pt-br
443+libreoffice-l10n-de
444+libreoffice-l10n-fr
445+libreoffice-l10n-it
446+libreoffice-l10n-ru
447+libreoffice-l10n-en-za
448+libreoffice-help-en-gb
449+libreoffice-help-es
450+libreoffice-help-zh-cn
451+libreoffice-help-zh-tw
452+libreoffice-help-pt
453+libreoffice-help-pt-br
454+libreoffice-help-de
455+libreoffice-help-fr
456+libreoffice-help-it
457+libreoffice-help-ru
458+libreoffice-help-en-us
459+thunderbird-locale-en
460+thunderbird-locale-en-gb
461+thunderbird-locale-en-us
462+thunderbird-locale-es
463+thunderbird-locale-es-ar
464+thunderbird-locale-es-es
465+thunderbird-locale-zh-cn
466+thunderbird-locale-zh-hans
467+thunderbird-locale-zh-hant
468+thunderbird-locale-zh-tw
469+thunderbird-locale-pt
470+thunderbird-locale-pt-br
471+thunderbird-locale-pt-pt
472+thunderbird-locale-de
473+thunderbird-locale-fr
474+thunderbird-locale-it
475+thunderbird-locale-ru
476+
477+# Unused rdepends
478+gir1.2-rb-3.0
479+gir1.2-totem-1.0
480+gir1.2-totemplparser-1.0
481+guile-2.0-libs
482+libabw-0.1-1
483+libavahi-ui-gtk3-0
484+libdmapsharing-3.0-2
485+libexttextcat-2.0-0
486+libexttextcat-data
487+libfreehand-0.1-1
488+libgnome-games-support-1-3
489+libgnome-games-support-common
490+libgom-1.0-0
491+libgrilo-0.3-0
492+liblangtag-common
493+liblangtag1
494+libmessaging-menu0
495+libmhash2
496+libminiupnpc10
497+libmwaw-0.3-3
498+libmythes-1.2-0
499+libnatpmp1
500+libneon27-gnutls
501+liborcus-0.13-0
502+libpagemaker-0.0-0
503+librdf0
504+libreoffice-avmedia-backend-gstreamer
505+libreoffice-base-core
506+libreoffice-common
507+libreoffice-core
508+libreoffice-draw
509+libreoffice-gtk3
510+libreoffice-style-colibre
511+libreoffice-style-elementary
512+libreoffice-style-tango
513+libraptor2-0
514+librasqal3
515+librevenge-0.0-0
516+librhythmbox-core10
517+libtotem0
518+libvisio-0.1-1
519+libwpd-0.10-10
520+libwpg-0.3-3
521+libwps-0.4-4
522+libyajl2
523+python3-uno
524+rhythmbox-data
525+rhythmbox-plugin-alternative-toolbar
526+rhythmbox-plugins
527+remmina-common
528+remmina-plugin-rdp
529+remmina-plugin-secret
530+remmina-plugin-vnc
531+duplicity
532+seahorse-daemon
533+shotwell-common
534+totem-common
535+totem-plugins
536+transmission-common
537+cheese-common
538+gnome-todo-common
539+libgnome-todo
540+gnome-video-effects
541+libcheese-gtk25
542+libcheese8
543+uno-libs3
544+ure
545+zeitgeist-core
546+hunspell-de-at-frami
547+hunspell-de-ch-frami
548+hunspell-de-de-frami
549+hunspell-en-au
550+hunspell-en-ca
551+hunspell-en-gb
552+hunspell-en-za
553+hunspell-es
554+hunspell-fr
555+hunspell-fr-classical
556+hunspell-it
557+hunspell-pt-br
558+hunspell-pt-pt
559+hunspell-ru
560+hyphen-de
561+hyphen-en-ca
562+hyphen-en-gb
563+hyphen-en-us
564+hyphen-fr
565+hyphen-hr
566+hyphen-it
567+hyphen-pl
568+hyphen-pt-br
569+hyphen-pt-pt
570+hyphen-ru
571+mythes-de
572+mythes-de-ch
573+mythes-en-au
574+mythes-en-us
575+mythes-fr
576+mythes-it
577+mythes-pt-pt
578+mythes-ru
579diff --git a/development b/development
580new file mode 100644
581index 0000000..06e4eea
582--- /dev/null
583+++ b/development
584@@ -0,0 +1,85 @@
585+<<<<<<< development
586+=======
587+Moved from desktop:
588+
589+ * python3-apt # MRS, we need to be able to interact with APT
590+ * python3-crypto # MRS, very useful even though it's very specific
591+ * python3-examples # MRS,
592+ * python3-geoip
593+ * python3-imaging-sane
594+ * python3-pycurl
595+ * python3-mysqldb
596+ * python3-newt
597+ * python3-pam
598+ * python3-pexpect
599+ * python3-pylibacl
600+ * python3-pyxattr
601+ * python3-reportlab
602+ * python3-xdg # SebastienBacher
603+ * python3-lxml
604+
605+Python 3 libraries with sources already in main
606+
607+ * python3-polib
608+ * python3-requests
609+ * python3-pyudev
610+ * python3-feedparser
611+ * python3-bson
612+ * python3-gridfs
613+ * python3-pymongo
614+ * python3-fixtures
615+ * python3-json-patch
616+ * python3-webob
617+ * python3-stevedore
618+ * python3-iso8601
619+ * python3-jsonschema
620+ * python3-testrepository
621+ * python3-configglue
622+ * python3-packagekit
623+ * python3-pep8
624+ * python3-itsdangerous
625+ * python3-bs4
626+ * python3-cmd2
627+ * python3-msgpack
628+ * python3-amqp
629+ * python3-cliff
630+ * python3-waitress
631+ * python3-prettytable
632+ * python3-astroid
633+ * python3-genshi
634+ * python3-logilab-common
635+ * python3-pexpect
636+ * python3-imaging
637+ * python3-nine
638+ * python3-psutil
639+ * python3-scripttest
640+ * python3-webtest
641+ * python3-sqlalchemy-ext
642+
643+Extra GCC packages
644+
645+ * g++-multilib # seed it directly until changing the defaults
646+ * cpp-doc
647+ * gcc-doc
648+
649+Ability to cleanly build packages
650+
651+ * schroot
652+ * sbuild
653+
654+Cross Toolchains
655+
656+ * crossbuild-essential-arm64
657+ * crossbuild-essential-armhf
658+ * crossbuild-essential-ppc64el
659+ * crossbuild-essential-s390x
660+
661+Additional supported languages
662+
663+ * golang
664+
665+# Packages should be recorded in their reverse-built-dependencies using
666+# 'Built-Using' due to code copied into target objects at build time.
667+= Built-using workarounds =
668+ * drac-dev
669+>>>>>>> development
670diff --git a/doc/langpacks.txt b/doc/langpacks.txt
671index 81c8baa..b234e4c 100644
672--- a/doc/langpacks.txt
673+++ b/doc/langpacks.txt
674@@ -27,6 +27,7 @@ language and all languages above it.
675 The list is vertically ordered by the priority, i. e. they should be
676 added from top to down.
677
678+<<<<<<< doc/langpacks.txt
679 Input support packages
680 ======================
681
682@@ -39,3 +40,19 @@ language code:
683 check-language-support -l ja --show-installed -p ibus
684
685 This displays the input methods for Japanese ("ja").
686+=======
687+Language support on DVDs
688+========================
689+
690+CDs are generally too small to ship a significant amount of language support
691+packages (spell checkers, etc.), thus we only ship a subset for English there.
692+
693+On DVDs, you should use check-language-support (from the
694+language-selector-common package) to compute the set of langauge support
695+packages which you want to add to DVD ship ("dvd-langsupport") or the DVD live
696+system ("dvd-live-langsupport"). Generate these with this command:
697+
698+ 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
699+
700+Update the list of languages accordingly.
701+>>>>>>> doc/langpacks.txt
702diff --git a/installer b/installer
703index c9913d9..7353763 100644
704--- a/installer
705+++ b/installer
706@@ -1,3 +1,4 @@
707+<<<<<<< installer
708 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.
709
710 = Common Packages =
711@@ -205,3 +206,5 @@ This list was originally constructed based on a [http://people.debian.org/~cjwat
712 == s390x ==
713
714 * linux-udebs-generic [s390x]
715+=======
716+>>>>>>> installer
717diff --git a/lamp-server b/lamp-server
718new file mode 100644
719index 0000000..244694c
720--- /dev/null
721+++ b/lamp-server
722@@ -0,0 +1,13 @@
723+<<<<<<< lamp-server
724+=======
725+Task-Section: server
726+Task-Description: LAMP server
727+Task-Extended-Description: Selects a ready-made Linux/Apache/MySQL/PHP server.
728+Task-Key: apache2 mysql-server
729+
730+ * apache2
731+ * apache2-mpm-prefork
732+ * php-mysql
733+ * libapache2-mod-php
734+ * mysql-server
735+>>>>>>> lamp-server
736diff --git a/languages/STRUCTURE b/languages/STRUCTURE
737new file mode 100644
738index 0000000..9d11b21
739--- /dev/null
740+++ b/languages/STRUCTURE
741@@ -0,0 +1,16 @@
742+desktop-en: desktop-minimal-en
743+desktop-minimal-en:
744+desktop-es: desktop-minimal-es
745+desktop-minimal-es:
746+desktop-de: desktop-minimal-de
747+desktop-minimal-de:
748+desktop-fr: desktop-minimal-fr
749+desktop-minimal-fr:
750+desktop-it: desktop-minimal-it
751+desktop-minimal-it:
752+desktop-pt: desktop-minimal-pt
753+desktop-minimal-pt:
754+desktop-ru: desktop-minimal-ru
755+desktop-minimal-ru:
756+desktop-zh: desktop-minimal-zh
757+desktop-minimal-zh:
758diff --git a/languages/desktop-de b/languages/desktop-de
759new file mode 100644
760index 0000000..0ba6a63
761--- /dev/null
762+++ b/languages/desktop-de
763@@ -0,0 +1,24 @@
764+
765+# Dictionaries for LibreOffice
766+## hyphenation and thesaurus
767+ * Language: de
768+ * hyphen-${Language}
769+ * mythes-${Language}
770+ * mythes-de-ch
771+
772+## hunspell german frami variant dict (more complete)
773+ * Languages: de-at de-ch de-de
774+ * hunspell-${Languages}-frami
775+
776+# Other Dictionary
777+ * wngerman
778+ * wogerman
779+ * wswiss
780+
781+# Default apps having separates translations
782+## Libreoffice l10n and help
783+ * libreoffice-l10n-${Language}
784+ * libreoffice-help-${Language}
785+
786+## Thunderbird
787+ * thunderbird-locale-${Language}
788diff --git a/languages/desktop-en b/languages/desktop-en
789new file mode 100644
790index 0000000..ceaf861
791--- /dev/null
792+++ b/languages/desktop-en
793@@ -0,0 +1,27 @@
794+# Dictionaries for LibreOffice
795+## hyphenation and thesaurus
796+ * Languages: en-us en-ca en-gb
797+ * hyphen-${Languages}
798+
799+ * Languages: en-us en-au
800+ * mythes-${Languages}
801+
802+## hunspell dict
803+ * Languages: en-au en-ca en-gb en-us en-za
804+ * hunspell-${Languages}
805+
806+# Other Dictionaries
807+ * wamerican
808+ * wbritish
809+
810+# Default apps having separates translations
811+## Libreoffice l10n and help
812+ * Language: en-gb
813+ * libreoffice-l10n-${Language}
814+ * libreoffice-help-${Language}
815+ * libreoffice-l10n-en-za
816+ * libreoffice-help-en-us
817+
818+## Thunderbird
819+ * Languages: en en-gb en-us
820+ * thunderbird-locale-${Languages}
821diff --git a/languages/desktop-es b/languages/desktop-es
822new file mode 100644
823index 0000000..8568799
824--- /dev/null
825+++ b/languages/desktop-es
826@@ -0,0 +1,20 @@
827+# Dictionaries for LibreOffice
828+## hyphenation and thesaurus
829+ * Language: es
830+ * hyphen-${Language}
831+ * mythes-${Language}
832+
833+## hunspell dict
834+ * hunspell-${Language}
835+
836+# Other Dictionaries
837+ * wspanish
838+
839+# Default apps having separates translations
840+## Libreoffice l10n and help
841+ * libreoffice-l10n-${Language}
842+ * libreoffice-help-${Language}
843+
844+## Thunderbird
845+ * Languages: es es-ar es-es
846+ * thunderbird-locale-${Languages}
847diff --git a/languages/desktop-fr b/languages/desktop-fr
848new file mode 100644
849index 0000000..ca278d0
850--- /dev/null
851+++ b/languages/desktop-fr
852@@ -0,0 +1,19 @@
853+# Dictionaries for LibreOffice
854+## hyphenation and thesaurus
855+ * Language: fr
856+ * hyphen-${Language}
857+ * mythes-${Language}
858+
859+## hunspell dict
860+ * hunspell-${Language}
861+
862+# Other Dictionaries
863+ * wfrench
864+
865+# Default apps having separates translations
866+## Libreoffice l10n and help
867+ * libreoffice-l10n-${Language}
868+ * libreoffice-help-${Language}
869+
870+## Thunderbird
871+ * thunderbird-locale-${Language}
872diff --git a/languages/desktop-it b/languages/desktop-it
873new file mode 100644
874index 0000000..c4a15fa
875--- /dev/null
876+++ b/languages/desktop-it
877@@ -0,0 +1,19 @@
878+# Dictionaries for LibreOffice
879+## hyphenation and thesaurus
880+ * Language: it
881+ * hyphen-${Language}
882+ * mythes-${Language}
883+
884+## hunspell dict
885+ * hunspell-${Language}
886+
887+# Other Dictionaries
888+ * witalian
889+
890+# Default apps having separates translations
891+## Libreoffice l10n and help
892+ * libreoffice-l10n-${Language}
893+ * libreoffice-help-${Language}
894+
895+## Thunderbird
896+ * thunderbird-locale-${Language}
897diff --git a/languages/desktop-minimal-de b/languages/desktop-minimal-de
898new file mode 100644
899index 0000000..1292896
900--- /dev/null
901+++ b/languages/desktop-minimal-de
902@@ -0,0 +1,11 @@
903+# Default languages for most applications we ship by default
904+ * Language: de
905+ * language-pack-${Language}
906+ * language-pack-gnome-${Language}
907+
908+# GNOME Help
909+ * gnome-getting-started-docs-${Language}
910+ * gnome-user-docs-${Language}
911+
912+# Firefox
913+ * firefox-locale-${Language}
914diff --git a/languages/desktop-minimal-en b/languages/desktop-minimal-en
915new file mode 100644
916index 0000000..1590f9a
917--- /dev/null
918+++ b/languages/desktop-minimal-en
919@@ -0,0 +1,7 @@
920+# Default languages for most applications we ship by default
921+ * Language: en
922+ * language-pack-${Language}
923+ * language-pack-gnome-${Language}
924+
925+# Firefox
926+ * firefox-locale-${Language}
927diff --git a/languages/desktop-minimal-es b/languages/desktop-minimal-es
928new file mode 100644
929index 0000000..cb638fb
930--- /dev/null
931+++ b/languages/desktop-minimal-es
932@@ -0,0 +1,11 @@
933+# Default languages for most applications we ship by default
934+ * Language: es
935+ * language-pack-${Language}
936+ * language-pack-gnome-${Language}
937+
938+# GNOME Help
939+ * gnome-getting-started-docs-${Language}
940+ * gnome-user-docs-${Language}
941+
942+# Firefox
943+ * firefox-locale-${Language}
944diff --git a/languages/desktop-minimal-fr b/languages/desktop-minimal-fr
945new file mode 100644
946index 0000000..1eec65c
947--- /dev/null
948+++ b/languages/desktop-minimal-fr
949@@ -0,0 +1,11 @@
950+# Default languages for most applications we ship by default
951+ * Language: fr
952+ * language-pack-${Language}
953+ * language-pack-gnome-${Language}
954+
955+# GNOME Help
956+ * gnome-getting-started-docs-${Language}
957+ * gnome-user-docs-${Language}
958+
959+# Firefox
960+ * firefox-locale-${Language}
961diff --git a/languages/desktop-minimal-it b/languages/desktop-minimal-it
962new file mode 100644
963index 0000000..d8e554a
964--- /dev/null
965+++ b/languages/desktop-minimal-it
966@@ -0,0 +1,11 @@
967+# Default languages for most applications we ship by default
968+ * Language: it
969+ * language-pack-${Language}
970+ * language-pack-gnome-${Language}
971+
972+# GNOME Help
973+ * gnome-getting-started-docs-${Language}
974+ * gnome-user-docs-${Language}
975+
976+# Firefox
977+ * firefox-locale-${Language}
978diff --git a/languages/desktop-minimal-pt b/languages/desktop-minimal-pt
979new file mode 100644
980index 0000000..e8fdf06
981--- /dev/null
982+++ b/languages/desktop-minimal-pt
983@@ -0,0 +1,11 @@
984+# Default languages for most applications we ship by default
985+ * Language: pt
986+ * language-pack-${Language}
987+ * language-pack-gnome-${Language}
988+
989+# GNOME Help
990+ * gnome-getting-started-docs-${Language}
991+ * gnome-user-docs-${Language}
992+
993+# Firefox
994+ * firefox-locale-${Language}
995diff --git a/languages/desktop-minimal-ru b/languages/desktop-minimal-ru
996new file mode 100644
997index 0000000..24586aa
998--- /dev/null
999+++ b/languages/desktop-minimal-ru
1000@@ -0,0 +1,11 @@
1001+# Default languages for most applications we ship by default
1002+ * Language: ru
1003+ * language-pack-${Language}
1004+ * language-pack-gnome-${Language}
1005+
1006+# GNOME Help
1007+ * gnome-getting-started-docs-${Language}
1008+ * gnome-user-docs-${Language}
1009+
1010+# Firefox
1011+ * firefox-locale-${Language}
1012diff --git a/languages/desktop-minimal-zh b/languages/desktop-minimal-zh
1013new file mode 100644
1014index 0000000..c522c55
1015--- /dev/null
1016+++ b/languages/desktop-minimal-zh
1017@@ -0,0 +1,23 @@
1018+# Default languages for most applications we ship by default
1019+ * Language: zh-hans
1020+ * language-pack-${Language}
1021+ * language-pack-gnome-${Language}
1022+
1023+# GNOME Help
1024+ * gnome-user-docs-zh-hans
1025+
1026+# Firefox
1027+ * firefox-locale-${Language}
1028+
1029+== Input methods ==
1030+ * ibus-chewing
1031+ * ibus-m17n
1032+ * ibus-libpinyin
1033+ * ibus-table-cangjie
1034+ * ibus-table-quick-classic
1035+ * ibus-table-wubi
1036+
1037+== Fonts (zh-hans) ==
1038+ * fonts-noto-cjk
1039+ * fonts-arphic-uming
1040+ * fonts-arphic-ukai
1041\ No newline at end of file
1042diff --git a/languages/desktop-pt b/languages/desktop-pt
1043new file mode 100644
1044index 0000000..d39a8e3
1045--- /dev/null
1046+++ b/languages/desktop-pt
1047@@ -0,0 +1,24 @@
1048+# Dictionaries for LibreOffice
1049+## hyphenation and thesaurus
1050+ * Language: pt-pt
1051+ * hyphen-${Language}
1052+ * hyphen-pt-br
1053+ * mythes-${Language}
1054+
1055+## hunspell dict
1056+ * Languages: pt-br pt-pt
1057+ * hunspell-${Languages}
1058+
1059+# Other Dictionaries
1060+ * wportuguese
1061+ * wbrazilian
1062+
1063+# Default apps having separates translations
1064+## Libreoffice l10n and help
1065+ * Languages: pt pt-br
1066+ * libreoffice-l10n-${Languages}
1067+ * libreoffice-help-${Languages}
1068+
1069+## Thunderbird
1070+ * Languages: pt pt-br pt-pt
1071+ * thunderbird-locale-${Languages}
1072diff --git a/languages/desktop-ru b/languages/desktop-ru
1073new file mode 100644
1074index 0000000..2e043c8
1075--- /dev/null
1076+++ b/languages/desktop-ru
1077@@ -0,0 +1,16 @@
1078+# Dictionaries for LibreOffice
1079+## hyphenation and thesaurus
1080+ * Language: ru
1081+ * hyphen-${Language}
1082+ * mythes-${Language}
1083+
1084+## hunspell dict
1085+ * hunspell-${Language}
1086+
1087+# Default apps having separates translations
1088+## Libreoffice l10n and help
1089+ * libreoffice-l10n-${Language}
1090+ * libreoffice-help-${Language}
1091+
1092+## Thunderbird
1093+ * thunderbird-locale-${Language}
1094diff --git a/languages/desktop-zh b/languages/desktop-zh
1095new file mode 100644
1096index 0000000..8e88ea4
1097--- /dev/null
1098+++ b/languages/desktop-zh
1099@@ -0,0 +1,9 @@
1100+# Default apps having separates translations
1101+## Libreoffice l10n and help
1102+ * Languages: zh-cn zh-tw
1103+ * libreoffice-l10n-${Languages}
1104+ * libreoffice-help-${Languages}
1105+
1106+## Thunderbird
1107+ * Languages: zh-cn zh-hans zh-tw
1108+ * thunderbird-locale-${Languages}
1109diff --git a/live b/live
1110new file mode 100644
1111index 0000000..146b95b
1112--- /dev/null
1113+++ b/live
1114@@ -0,0 +1,35 @@
1115+<<<<<<< live
1116+=======
1117+Task-Per-Derivative: 1
1118+Task-Section: user
1119+Task-Description: Ubuntu live CD
1120+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.
1121+Task-Relevance: 2
1122+Task-Key: ubiquity-frontend-gtk
1123+Task-Test-new-install: skip show
1124+Task-Seeds: live-common desktop-default-languages
1125+
1126+
1127+== Input methods ==
1128+
1129+Input methods for non-default languages included in live
1130+
1131+ * gtk-im-libthai
1132+ * ibus-hangul
1133+ * ibus-mozc
1134+ * ibus-unikey
1135+
1136+== Ubiquity components ==
1137+
1138+These packages make up the Ubiquity live installer.
1139+
1140+ * ubiquity-frontend-gtk
1141+ * ubiquity-ubuntu-artwork
1142+ * ubiquity-slideshow-ubuntu
1143+
1144+== Misc ==
1145+
1146+ * gparted
1147+ * cifs-utils # Needed by casper for CIFS root=
1148+
1149+>>>>>>> live
1150diff --git a/mail-server b/mail-server
1151new file mode 100644
1152index 0000000..a6b0be9
1153--- /dev/null
1154+++ b/mail-server
1155@@ -0,0 +1,17 @@
1156+<<<<<<< mail-server
1157+=======
1158+Task-Section: server
1159+Task-Description: Mail server
1160+Task-Extended-Description: This task selects a variety of package useful for a general purpose mail
1161+Task-Extended-Description: server system.
1162+Task-Key: postfix
1163+
1164+ * postfix
1165+ * dovecot-pop3d
1166+ * dovecot-imapd
1167+ * bsd-mailx
1168+ * mutt
1169+ * procmail
1170+
1171+Additionally, Debian has mailagent, but that's in universe and not an option.
1172+>>>>>>> mail-server
1173diff --git a/minimal b/minimal
1174index df3f8e1..60daf67 100644
1175--- a/minimal
1176+++ b/minimal
1177@@ -1,3 +1,4 @@
1178+<<<<<<< minimal
1179 Task-Section: user
1180 Task-Relevance: 9
1181 Task-Description: Minimal base system
1182@@ -62,3 +63,5 @@ These provide various networking services, all should be configured in a client-
1183 * init # ensure we have an init system (but minimal chroots)
1184 * ubuntu-minimal # Ubuntu-specific bits we want on every Ubuntu system
1185
1186+=======
1187+>>>>>>> minimal
1188diff --git a/openssh-server b/openssh-server
1189new file mode 100644
1190index 0000000..286060b
1191--- /dev/null
1192+++ b/openssh-server
1193@@ -0,0 +1,10 @@
1194+<<<<<<< openssh-server
1195+=======
1196+Task-Section: server
1197+Task-Description: OpenSSH server
1198+Task-Extended-Description: Selects packages needed for an OpenSSH server.
1199+Task-Relevance: 7
1200+Task-Key: openssh-server
1201+
1202+ * openssh-server
1203+>>>>>>> openssh-server
1204diff --git a/print-server b/print-server
1205new file mode 100644
1206index 0000000..d037365
1207--- /dev/null
1208+++ b/print-server
1209@@ -0,0 +1,15 @@
1210+<<<<<<< print-server
1211+=======
1212+Task-Section: server
1213+Task-Description: Print server
1214+Task-Extended-Description: This task sets up your system to be a print server.
1215+Task-Key: cups cups-bsd cups-client
1216+
1217+ * cups
1218+ * cups-bsd
1219+ * cups-client
1220+ * printer-driver-gutenprint
1221+ * foomatic-db-compressed-ppds
1222+ * printer-driver-hpijs
1223+ * openprinting-ppds
1224+>>>>>>> print-server
1225diff --git a/required b/required
1226index f309b2d..7230208 100644
1227--- a/required
1228+++ b/required
1229@@ -1,3 +1,4 @@
1230+<<<<<<< required
1231 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.
1232
1233 A system containing only required packages is not a supported Ubuntu system; you need to install at least the packages from minimal as well.
1234@@ -48,3 +49,5 @@ Other packages necessary to get started:
1235 * procps
1236 * sensible-utils # used to be pulled in by debianutils, tons of undeclared deps
1237 * sysvinit-utils # pidof tool (Debian #810018) and init-d-script for SysV init scripts
1238+=======
1239+>>>>>>> required
1240diff --git a/samba-server b/samba-server
1241new file mode 100644
1242index 0000000..4834f8b
1243--- /dev/null
1244+++ b/samba-server
1245@@ -0,0 +1,17 @@
1246+<<<<<<< samba-server
1247+=======
1248+Task-Section: server
1249+Task-Description: Samba file server
1250+Task-Extended-Description: This task sets up your system to be a Samba file server, which is
1251+Task-Extended-Description: especially suitable in networks with both Windows and Linux systems.
1252+Task-Key: samba
1253+
1254+ * libpam-winbind
1255+ * libnss-winbind
1256+ * samba
1257+ * samba-doc
1258+ * smbclient
1259+ * cifs-utils
1260+ * winbind
1261+
1262+>>>>>>> samba-server
1263diff --git a/server b/server
1264new file mode 100644
1265index 0000000..5ab2b66
1266--- /dev/null
1267+++ b/server
1268@@ -0,0 +1,65 @@
1269+Task-Section: server
1270+Task-Description: Basic Ubuntu server
1271+Task-Extended-Description: This task provides the Ubuntu server environment.
1272+Task-Relevance: 8
1273+Task-Key: screen
1274+
1275+This seed lists the packages we want to install by default in the new server install.
1276+
1277+= System administration tools =
1278+
1279+ * apport # LP: #424051
1280+ * at
1281+ * byobu
1282+ * curl
1283+ * git # LP: 1394756
1284+ * patch
1285+ * pollinate # Seed the PRNG
1286+ * screen
1287+ * software-properties-common # LP: #439566
1288+ * tmux # Share/detach sessions
1289+ * vim
1290+ * wget # Fetch data from the command line
1291+
1292+= Network =
1293+
1294+ * ethtool # Essential network diagnostics
1295+
1296+= Maintenance =
1297+
1298+ * update-notifier-common
1299+ * (fwupd) # in band vendor agnostic firmware updates (LP: #1749774)
1300+
1301+= Block Device and Filesystem =
1302+
1303+ * lvm2 # Needed by MAAS images
1304+ * mdadm # Used by many physical machines
1305+ * multipath-tools # server-ship/server-live ship multipath-tools-boot, but we need multipath-tools everywhere else.
1306+ * (open-iscsi) # Needed by MAAS images, but be removable LP: #1630946
1307+ * bcache-tools # Used by MAAS images, when possible
1308+ * btrfs-progs # Commonly used server filesystem
1309+ * xfsprogs # Commonly used server filesystem
1310+
1311+= Debugging and Diagnostics =
1312+
1313+ * htop
1314+ * sosreport # LP: #1311274, troubleshooting for Ubuntu Advantage support
1315+
1316+= Initramfs Modules =
1317+
1318+ * cloud-initramfs-copymods # Needed by MAAS images
1319+ * cloud-initramfs-dyn-netconf # Needed by MAAS images (LP: #1750851)
1320+ * overlayroot # Needed by MAAS
1321+
1322+= Other =
1323+
1324+ * ubuntu-server # metapackage for everything in this task
1325+ * cloud-guest-utils # growpart (resize partitions)
1326+ * fonts-ubuntu-console # Part of the Ubuntu server experience
1327+ * snap:lxd # Every Ubuntu server can host 100x containers
1328+ * open-vm-tools # Only needed for Ubuntu as VMware guests
1329+ * (snapd)
1330+ * s390-tools [s390x] # needed for z block devices, bootloader, encryption features, etc.
1331+ * gnupg
1332+ * dirmngr
1333+ * (landscape-common) # LP: #1756261, recommends to be removable for minimal (LP: #1763182)
1334diff --git a/server-ship b/server-ship
1335new file mode 100644
1336index 0000000..64b93ef
1337--- /dev/null
1338+++ b/server-ship
1339@@ -0,0 +1,277 @@
1340+<<<<<<< server-ship
1341+=======
1342+= Kernel =
1343+
1344+We seed both linux-* and linux-image-* so that it's easier to build CD
1345+images without the restricted component. The linux-* kernels include
1346+restricted modules.
1347+
1348+ * Kernel-Stem: linux linux-image
1349+ * Signed-Kernel-Stem: linux-signed linux-signed-image
1350+
1351+== i386 ==
1352+
1353+ * ${Kernel-Stem}-virtual [i386]
1354+ * linux-headers-virtual [i386]
1355+
1356+== powerpc ==
1357+
1358+ * ${Kernel-Stem}-powerpc-smp [powerpc]
1359+ * linux-headers-powerpc-smp [powerpc]
1360+
1361+== ppc64el ==
1362+
1363+ * ${Kernel-Stem}-generic [ppc64el]
1364+ * linux-headers-generic [ppc64el]
1365+ * ${Kernel-Stem}-virtual [ppc64el]
1366+ * linux-headers-virtual [ppc64el]
1367+ * opal-prd [ppc64el] # for OpenPOWER machines LP: #1555904 LP: #1691557
1368+
1369+== s390x ==
1370+
1371+ * ${Kernel-Stem}-generic [s390x]
1372+ * linux-headers-generic [s390x]
1373+ * ${Kernel-Stem}-virtual [s390x]
1374+ * linux-headers-virtual [s390x]
1375+
1376+== amd64 ==
1377+
1378+ * ${Kernel-Stem}-server [amd64]
1379+ * linux-headers-server [amd64]
1380+ * ${Kernel-Stem}-virtual [amd64]
1381+ * linux-headers-virtual [amd64]
1382+
1383+ * ${Signed-Kernel-Stem}-generic [amd64]
1384+
1385+= From Ship =
1386+
1387+ * ssh
1388+ * chrony # ntpd replaced by chrony >=18.04 (LP: #1744072)
1389+ * bsd-mailx
1390+ * mutt
1391+ * build-essential
1392+ * fakeroot
1393+ * devscripts
1394+ * setserial
1395+
1396+= Cluster =
1397+
1398+ * ocfs2-tools
1399+ * libaio1
1400+ * libaio-dev
1401+ * ipvsadm
1402+ * keepalived
1403+ * multipath-tools-boot
1404+ * pacemaker
1405+
1406+= Servers and Daemons =
1407+
1408+Database:
1409+
1410+ * mysql-client
1411+ * mysql-server
1412+ * postgresql
1413+ * postgresql-client
1414+ * postgresql-doc
1415+
1416+Proxy:
1417+
1418+ * squid # RobertCollins for squid generally, JamieStrandboge for squid3 (LP: #885283), AndreasHasenack back to squid (LP: #1780944)
1419+
1420+LDAP:
1421+
1422+ * slapd
1423+ * ldap-utils
1424+
1425+Web:
1426+
1427+ * apache2
1428+ * apache2-doc
1429+ * apache2-mpm-event
1430+ * apache2-mpm-prefork
1431+ * apache2-mpm-worker
1432+ * apache2-utils
1433+ * libapache2-mod-auth-mysql # FabioMassimoDiNitto
1434+ * libapache2-mod-auth-pgsql # FabioMassimoDiNitto
1435+ * libapache2-mod-macro # FabioMassimoDiNitto
1436+ * libapache2-mod-perl2 # python is in supported
1437+ * libapache2-mod-auth-plain # FabioMassimoDiNitto
1438+ #* libapache2-modsecurity # FabioMassimoDiNitto
1439+ * libapache-mod-auth-kerb # ChuckShort
1440+
1441+PHP:
1442+
1443+ * libapache2-mod-php
1444+ * php-pear
1445+ * php-cgi
1446+ * php-cli
1447+ * php-curl
1448+ * php-gd
1449+ * php-gmp
1450+ * php-ldap
1451+ * php-mysql
1452+ * php-odbc
1453+ * php-pgsql
1454+ * php-pspell
1455+ * php-recode
1456+ * php-snmp
1457+ * php-sqlite3
1458+ * php-tidy
1459+ * php-xmlrpc
1460+ * php-xml
1461+ * php
1462+
1463+Email:
1464+
1465+ * dovecot-imapd
1466+ * dovecot-pop3d
1467+ * postfix-cdb
1468+ * postfix-doc
1469+ * postfix-ldap
1470+ * postfix-mysql
1471+ * postfix-pcre
1472+ * postfix-pgsql
1473+ * postfix
1474+ * amavisd-new # ChuckShort
1475+ * spamassassin # Scott Kitterman
1476+ * clamav # Scott Kitterman
1477+ * clamav-daemon # Scott Kitterman
1478+
1479+Must also consider webmail and so on...
1480+
1481+FTP/TFTP:
1482+
1483+ * vsftpd # a secure ftpd
1484+ * tftpd-hpa # The one from OpenBSD which supports PXE
1485+ * tftp-hpa # client
1486+
1487+Printing:
1488+ * cups # our preferred printer management infrastructure
1489+ * cups-bsd # gives us lpc, lpq, lpr, lprm
1490+ * cups-client # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove
1491+ * foomatic-db-compressed-ppds # the foomatic printer driver database
1492+ * openprinting-ppds
1493+ * printer-driver-gutenprint # a ton of cupsys ppds, for real comprehensive printer support
1494+ * pnm2ppa # several ppds require this
1495+ * ghostscript # some ppds require this
1496+
1497+Other:
1498+
1499+ * isc-dhcp-server
1500+ * snmp
1501+ * snmpd
1502+ * nbd-server
1503+ * open-iscsi # ChuckShort
1504+ * open-iscsi-udeb # SorenHansen
1505+ * drbd-utils # ChuckShort - ServerPackageReview
1506+ * nut # ChuckShort - ServerPackageReview
1507+ * nut-cgi
1508+ * nut-snmp
1509+ * openvpn #ChuckShort - ServerPackageReview
1510+ * netcat-openbsd
1511+ * libpkcs11-helper1
1512+ * zip #ChuckShort - server-lucid-seeds
1513+ * tdb-tools #ChuckShort - server-lucid-seeds
1514+ * acl #ChuckShort - server-lucid-seeds
1515+ * maas
1516+ * maas-region-udeb
1517+ * maas-rack-udeb
1518+ * maas-enlist
1519+ * maas-enlist-udeb
1520+ * open-vm-tools #utlemming
1521+
1522+Utilities:
1523+
1524+ * numactl # LP: #1700826
1525+ * pciutils # kirkland added at the request of onsite hardware enablement (manjo)
1526+
1527+= Network =
1528+
1529+ * nmap # network diagnostics
1530+ * dnstracer # dns network diagnostics
1531+ * ifupdown # (old) high level tools to configure network interfaces
1532+ * iptraf # For smooth upgrades from 16.04, can be dropped in 18.10
1533+ * iptraf-ng # sysadmin's toy, may be a candidate for removal
1534+ * pptpd # server that allows setup of Microsoft-compatible VPN
1535+ * strongswan-starter # IPsec configuration
1536+ * vlan # userland tools to config 8021q support
1537+ * vlan-udeb # userland tools to support 8021q from the installer
1538+ * bridge-utils # userland tools to config kernel bridging feature
1539+ * wakeonlan # sends magic packet to wake sleeping servers
1540+ * iputils-arping # would have made elmo's life easier at debconf 4
1541+ * ppp # ppp utilities useful to be on a CD when someone needs them
1542+ * pppconfig
1543+ * pppoeconf
1544+ * wireless-tools
1545+ * wpasupplicant
1546+
1547+IPv6 tools:
1548+
1549+ * radvd # FabioMassimoDiNitto
1550+
1551+Security:
1552+
1553+ * checksecurity # JamesTroup, from Hoglet
1554+ * aide # JamesTroup, from Hoglet
1555+
1556+= System Administration Tools =
1557+
1558+ * attr # will move to base if we go to selinux
1559+ * quota
1560+ * whois # FabioMassimoDiNitto
1561+ * cu # super-basic serial access
1562+ * libpam-cracklib # enables weak password checking during password change, should it be in desktop?
1563+ * libpam-krb5 # ChuckShort
1564+ * libpam-mount # ChuckShort
1565+ * libpam-p11 # ChuckShort
1566+ * libcap2-bin
1567+ * sasl2-bin
1568+ * autofs5
1569+ * acct
1570+ * siege
1571+ * smartmontools # hard disk diagnostics
1572+ * logwatch # ChuckShort - ServerPackageReview
1573+ * lsscsi # ChuckShort
1574+ * sysstat # ChuckShort - ServerPackageReview
1575+ * openipmi # ChuckShort - ServerPackageReview
1576+ * unattended-upgrades
1577+ * update-motd # RickClark
1578+ * landscape-client # RickClark
1579+
1580+= Virtualisation =
1581+
1582+ * qemu-kvm
1583+ * qemu-system-x86 [i386 amd64]
1584+ * qemu-system-ppc [powerpc ppc64el]
1585+ * qemu-system-aarch64 [arm64]
1586+ * qemu-system-s390x [s390x]
1587+ * python3-libvirt
1588+ * libvirt-bin
1589+
1590+== Miscellaneous ==
1591+
1592+ * checkbox-ng # roadmr
1593+ * apport # MathiasGug
1594+ * kerneloops # JamesWestby
1595+ * memtest86+
1596+
1597+= From desktop =
1598+
1599+ * bc
1600+ * screen
1601+ * lftp
1602+ * zip
1603+ * unzip # also used for .zip support in file-roller
1604+
1605+= Installer =
1606+
1607+ * live-installer
1608+ * oem-config-debconf
1609+ * partman-iscsi
1610+
1611+== Blacklist ==
1612+
1613+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
1614+
1615+ * !libavcodec*
1616+>>>>>>> server-ship
1617diff --git a/server-ship-live b/server-ship-live
1618new file mode 100644
1619index 0000000..a052c8a
1620--- /dev/null
1621+++ b/server-ship-live
1622@@ -0,0 +1,45 @@
1623+= Kernel =
1624+
1625+== generic ==
1626+
1627+ * linux-generic
1628+ * opal-prd [ppc64el] # for OpenPOWER machines LP: #1555904 LP: #1691557
1629+
1630+= OpenSSH server =
1631+
1632+The security team's position has always been that installing openssh should be
1633+opt-in, so that it is clear to the person performing the installation that ssh
1634+will be active. And so it is necessary to have openssh-server in the pool so
1635+that it can be installed if the user opts into it.
1636+
1637+ * openssh-server
1638+
1639+= Curtin =
1640+
1641+These packages may be installed dynamically by curtin based on
1642+installation parameters. They should generally be made available on
1643+curtin based CDs.
1644+
1645+== curtin block/deps.py ==
1646+
1647+ * bcache-tools
1648+ * btrfs-tools
1649+ * e2fsprogs
1650+ * jfsutils
1651+ * lvm2
1652+ * mdadm
1653+ * ntfs-3g
1654+ * open-iscsi
1655+ * reiserfsprogs
1656+ * xfsprogs
1657+ * zfs-initramfs
1658+ * zfsutils-linux
1659+
1660+== curtin curthooks.py ==
1661+
1662+ * multipath-tools-boot
1663+ * s390-tools
1664+ * s390-tools-zkey
1665+ * grub-efi
1666+ * grub-efi-arm64
1667+ * shim-signed
1668diff --git a/ship b/ship
1669new file mode 100644
1670index 0000000..bea6fc9
1671--- /dev/null
1672+++ b/ship
1673@@ -0,0 +1,69 @@
1674+<<<<<<< ship
1675+=======
1676+== Kernel ==
1677+
1678+ * linux-generic [amd64 i386 ppc64el arm64 s390x]
1679+
1680+== Server ==
1681+
1682+ * ssh
1683+ * nfs-kernel-server # need an NFS server
1684+ * open-iscsi
1685+ * open-iscsi-udeb
1686+
1687+== Networking ==
1688+
1689+ * bsd-mailx
1690+
1691+== Common UNIX stuff ==
1692+
1693+ * nfs-common # allows people to access NFS filesystems
1694+ # * vim # vim-tiny is in minimal; vim includes syntax highlighting, help files, etc.
1695+
1696+== Hardware & Network Access ==
1697+
1698+ * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs
1699+
1700+ * libatm1 # suggested by ppp for PPP-over-ATM
1701+ * setserial # needed by folks with nonstandard serial ports
1702+ * b43-fwcutter
1703+ * sosreport
1704+
1705+== Common language packs ==
1706+
1707+ * Languages: en
1708+ * language-pack-${Languages}
1709+ * language-pack-gnome-${Languages}
1710+
1711+ # no space on powerpc
1712+ * Languages: es
1713+ * language-pack-${Languages} [i386 amd64 amd64+mac]
1714+ * language-pack-gnome-${Languages} [i386 amd64 amd64+mac]
1715+
1716+# subset of English language support which we want by default:
1717+ * firefox-locale-en
1718+ * libreoffice-help-en-us [i386 amd64 amd64+mac]
1719+ * hunspell-en-us
1720+ * hyphen-en-gb
1721+
1722+== Installer ==
1723+
1724+ * bootstrap-base
1725+ * oem-config-gtk
1726+ * oem-config-slideshow-ubuntu
1727+ * uboot-mkimage [armel]
1728+ * partman-iscsi
1729+ * s390-tools-zkey [s390x]
1730+
1731+== Transitional packages ==
1732+
1733+== Germinate workarounds ==
1734+
1735+ * wamerican # iamerican Depends: ispell Recommends: wordlist, but wamerican isn't spotted in time so germinate arbitrarily picks miscfiles instead
1736+
1737+== Blacklist ==
1738+
1739+libavcodec cannot be shipped on CDs (cf. Ubuntu technical board resolution 2007-01-02).
1740+
1741+ * !libavcodec*
1742+>>>>>>> ship
1743diff --git a/ship-live b/ship-live
1744new file mode 100644
1745index 0000000..3f16fe7
1746--- /dev/null
1747+++ b/ship-live
1748@@ -0,0 +1,35 @@
1749+<<<<<<< ship-live
1750+=======
1751+The ship-live seed will be added to the live CD as an ordinary package
1752+archive. Here belongs anything that somebody might need to install after
1753+installing the contents of the live CD in order to get online and fetch more
1754+packages.
1755+
1756+== Hardware & Network Access ==
1757+
1758+ * sl-modem-daemon # needed for some Winmodems (see OutoftheboxWinmodem)
1759+ * intel-microcode # needed to update Intel cpu microcode LP #1386257
1760+ * amd64-microcode # needed to update AMD cpu microcode LP #1386257
1761+
1762+ * libatm1 # suggested by ppp for PPP-over-ATM
1763+ * setserial # needed by folks with nonstandard serial ports
1764+ * mouseemu # needed on Macs with single-button mice
1765+ * b43-fwcutter
1766+ * bcmwl-kernel-source #since we no longer have LRM
1767+
1768+== Installer ==
1769+
1770+ * grub-efi [amd64]
1771+ * grub-efi-amd64-signed [amd64]
1772+ * shim-signed [amd64]
1773+ * oem-config-gtk
1774+ * oem-config-slideshow-ubuntu
1775+ * lupin-support [amd64 i386] # installer-for-windows
1776+ * uboot-mkimage [armel] # needed on dove for uboot
1777+
1778+== Blacklist ==
1779+
1780+libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02).
1781+
1782+ * !libavcodec*
1783+>>>>>>> ship-live
1784diff --git a/standard b/standard
1785index a35a9a0..652ee6d 100644
1786--- a/standard
1787+++ b/standard
1788@@ -1,3 +1,4 @@
1789+<<<<<<< standard
1790 Task-Section: user
1791 Task-Relevance: 8
1792 Task-Description: Standard system
1793@@ -87,3 +88,5 @@ These are used for debugging problems or examining the system.
1794 * ubuntu-standard # metapackage for everything here
1795 * (apt) # James Westby, enables access to private PPAs among other things
1796 * language-selector-common # helps installer to work out which language-support packages to install
1797+=======
1798+>>>>>>> standard
1799diff --git a/supported b/supported
1800new file mode 100644
1801index 0000000..a122c1f
1802--- /dev/null
1803+++ b/supported
1804@@ -0,0 +1,212 @@
1805+<<<<<<< supported
1806+=======
1807+This seed includes some things that are too big for a DVD, and of course also
1808+inherits from everything else.
1809+
1810+= Language support =
1811+
1812+ * /^language-pack-[^-]+$/
1813+ * /^language-pack-gnome-[^-]+$/
1814+ * /^language-pack-gnome-zh-han/
1815+ * /^language-pack-zh-han/
1816+
1817+The following packages also have application translations, but are not
1818+using gettext, but a custom format. language-selector will install
1819+them as appropriate.
1820+
1821+ * /^libreoffice-help-/
1822+ * /^libreoffice-l10n-/
1823+ * /^thunderbird-locale-/
1824+ * /^firefox-locale-/
1825+ * /^gnome-user-docs-/
1826+ * /^gnome-getting-started-docs-/
1827+ * poppler-data
1828+
1829+The following input aids are also installed on demand by
1830+language-selector:
1831+
1832+ * libenchant-voikko
1833+ * libreoffice-voikko
1834+ * mozvoikko
1835+ * tmispell-voikko
1836+ * /^hyphen-..$/
1837+ * /^hyphen-en-..$/
1838+ * /^mythes-/
1839+ * /^hunspell-[^-]*$/
1840+ * /^hunspell-de-..-frami/
1841+ * /^hunspell-..-..$/
1842+
1843+myspell packages containing the hunspell dictionaries:
1844+
1845+ * Languages: eo et fa fo ga gv hy ku nr ns ss st tn ts ve xh zu
1846+ * myspell-${Languages}
1847+
1848+Other dictionaries, word lists, and thesauri:
1849+
1850+ * dict-foldoc
1851+ * dict-gcide
1852+ * dict-jargon
1853+ * dict-moby-thesaurus
1854+ * dict-vera
1855+ * dictd
1856+ * wamerican
1857+ * wbrazilian
1858+ * wbritish
1859+ * wbulgarian
1860+ * wcatalan
1861+ * wdanish
1862+ * wdutch
1863+ * wfaroese
1864+ * wfrench
1865+ * wgalician-minimos
1866+ * wirish
1867+ * witalian
1868+ * wmanx
1869+ * wngerman
1870+ * wnorwegian
1871+ * wogerman
1872+ * wpolish
1873+ * wportuguese
1874+ * wspanish
1875+ * wswedish
1876+ * wswiss
1877+ * wukrainian
1878+
1879+Fonts installed on demand by language-selector:
1880+
1881+ * fonts-arabeyes
1882+ * fonts-arphic-ukai
1883+ * fonts-arphic-uming
1884+ * fonts-beng
1885+ * fonts-deva
1886+ * fonts-farsiweb
1887+ * fonts-gujr
1888+ * fonts-guru
1889+ * fonts-indic
1890+ * fonts-kacst
1891+ * fonts-khmeros
1892+ * fonts-knda
1893+ * fonts-lao
1894+ * fonts-lklug-sinhala
1895+ * fonts-manchufont
1896+ * fonts-mlym
1897+ * fonts-nafees
1898+ * fonts-noto-cjk
1899+ * fonts-noto-cjk-extra
1900+ * fonts-orya
1901+ * fonts-sil-abyssinica
1902+ * fonts-sil-ezra
1903+ * fonts-sil-nuosusil
1904+ * fonts-sil-padauk
1905+ * fonts-sil-scheherazade
1906+ * fonts-taml
1907+ * fonts-telu
1908+ * fonts-tibetan-machine
1909+ * fonts-thai-tlwg
1910+ * fonts-ukij-uyghur
1911+
1912+= Installed on demand =
1913+
1914+ * apparmor-utils # AppArmor profile development
1915+ * apparmor-notify # LP: #893266
1916+ * apparmor-profiles
1917+ * libapache2-mod-apparmor
1918+ * libpam-apparmor
1919+ * python3-libapparmor
1920+ * auditd
1921+
1922+= Transistional Pacakages for Upgrades from 18.04 =
1923+
1924+ * squid3
1925+
1926+= Transistional Pacakages for Upgrades from 16.04 =
1927+
1928+ * libcomerr2
1929+ * e2fslibs
1930+
1931+= Rescued from Extra =
1932+
1933+ * Extra-Include: *-dbg *-debug *-dev *-doc *-docs gir1.2-* *-examples
1934+
1935+... and some miscellaneous exclusions for things we don't want to drag in
1936+automatically (note that Extra-Exclude *only* prevents packages from being
1937+included due to matching Extra-Include patterns, and has no other effect):
1938+
1939+ * Extra-Exclude: libstdc++6-doc libstdc++6-dev libstdc++6-dbg lib*stdc++6-4.[4-9]*
1940+ * Extra-Exclude: libgnat*-dev libgnat*-dbg gnat*-doc
1941+ * Extra-Exclude: gfortran-[0-9]*-doc
1942+ * Extra-Exclude: lib*go[0-9]*-dbg
1943+ * Extra-Exclude: lib*objc[0-9]*-dbg
1944+ * Extra-Exclude: libgcj[0-9]*-dbg libgcj[0-9]*-dev
1945+ * Extra-Exclude: lib*gphobos[0-9]*-dbg lib*gphobos[0-9]*-dev
1946+ * Extra-Exclude: gcc-8-doc gfortran-8-doc cpp-8-doc libgccjit-8-doc
1947+ * Extra-Exclude: gcc-8-plugin-dev
1948+ * Extra-Exclude: lib*gfortran-8-dev lib*gfortran5-dbg
1949+ * Extra-Exclude: lib*stdc++-8-dev lib*stdc++6-8-dbg
1950+ * Extra-Exclude: lib*gcc-8-dev libhsail-rt-8-dev lib*objc-8-dev
1951+ * Extra-Exclude: lib*ubsan1-dbg
1952+ * 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
1953+ * Extra-Exclude: lldb-* liblldb-* clang* libclang* libllvm-* libfuzzer-* liblld-* libomp-* lld-* libc++-* libc++abi-* llvm-*
1954+ * Extra-Exclude: libavformat-dev libpostproc-dev
1955+ * Extra-Exclude: libnetpbm9-dev
1956+ * Extra-Exclude: libboost-*-dev libboost*-all-dev libboost-doc libboost*-doc
1957+ * Extra-Exclude: libcdio-*-dev libiso9660-dev
1958+ * Extra-Exclude: nvidia-glx-legacy-dev # nvidia-glx-legacy is unsupportable
1959+ * Extra-Exclude: *-cil *-cil-dev # Mono stuff
1960+ * Extra-Exclude: libappindicator-dev libindicator3-dev libindicator-dev libdbusmenu-gtk-dev # gtk2 versions
1961+ * Extra-Exclude: gir1.2-appindicator-0.1 gir1.2-dbusmenu-gtk-0.4 # gtk2 versions
1962+ * Extra-Exclude: libcanberra-gtk-dev libgutenprintui2-dev # pulls in gtk2
1963+ * Extra-Exclude: libgtk2.0-dev libglade2-dev libgail-dev libgtkmm-2.4-dev gir1.2-gtk-2.0 gtk2.0-examples # pulls in gtk2
1964+ * Extra-Exclude: libhandy*-dev # pulls in glade LP: #1815483
1965+ * 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
1966+ * Extra-Exclude: python-renderpm-dbg
1967+ * Extra-Exclude: python-reportlab-accel-dbg # packages aren't in main, -dbg shouldn't cause them to be
1968+ * Extra-Exclude: sendmail-doc # sendmail source is only in main for libmilter
1969+ * Extra-Exclude: grub-coreboot-dbg grub-emu-dbg
1970+ * Extra-Exclude: haproxy-doc # https://lists.ubuntu.com/archives/ubuntu-release/2014-July/002967.html
1971+ * Extra-Exclude: imagemagick-6-doc imagemagick-doc # LP: #1667150
1972+ * Extra-Exclude: libfftw3-mpi-dev
1973+ * Extra-Exclude: thunderbird-gnome-support-dbg # Unity support additions
1974+ * Extra-Exclude: libturbojpeg0-dev # legacy API not for main
1975+ * Extra-Exclude: libappstreamqt-dev libgpgmepp-dev libpoppler-qt5-dev libsnapd-qt-dev gstreamer1.0-plugins-good-dbg # don't pull in Qt
1976+ * Extra-Exclude: rrdtool-dbg # pulls in rrdtool-tcl & tcl/tk
1977+ * Extra-Exclude: libblockdev-lvm-dev # pulls in thin-provisioning-tools, no MIR yet
1978+ * Extra-Exclude: libblockdev-btrfs-dev libblockdev-kbd-dev libblockdev-mdraid-dev libblockdev-vdo-dev # pulls in libbytesize, no MIR yet
1979+ * Extra-Exclude: libblockdev-nvdimm-dev # pulls in ndctl
1980+ * Extra-Exclude: libu2f-host-dev libu2f-host-doc # we actually just want the udev rules for U2F devices
1981+ * Extra-Exclude: golang-github-ubuntu-ubuntu-report-dev # we only want the ubuntu-report binary
1982+ * Extra-Exclude: emacs-lucid-dbg
1983+ * Extra-Exclude: python-markdown-doc # mkdocs, mkdocs-nature in universe
1984+ * Extra-Exclude: python-networkx-doc # too many universe deps
1985+ * Extra-Exclude: dpdk-dev libdpdk-dev dpdk-doc # -dev has universe deps e.g. intel-ipsec-mb (Details at LP: #1814060)
1986+ * Extra-Exclude: libneon27-dev libneon27-dbg # dev package for the unused OpenSSL variant, we use -gnutls variant in main
1987+ * Extra-Exclude: python-*-dbg python-*-dev
1988+
1989+= Build infrastructure =
1990+
1991+ * pkgbinarymangler # needs to be in main to stay in the buildd chroots
1992+
1993+= Converted to snaps =
1994+# Especially since we don't convert .deb to snaps on upgrade, let's keep these in main for now:
1995+
1996+ * gnome-calculator
1997+ * gnome-characters
1998+ * gnome-logs
1999+ * gnome-system-monitor
2000+
2001+= Other =
2002+
2003+ * apt-config-icons*
2004+ * miscfiles
2005+ * sosreport # AdamStokes LP: #1206106
2006+ * nvidia-prime
2007+ * fglrx-pxpress
2008+ * ipxe
2009+ * w3m # The One True console web browser, needed to keep doc packages in main
2010+ * curtin # subiquity needs it; python3-curtin already seeded via maas.
2011+ * network-manager-openvpn # used by Canonical employees to access our VPN
2012+
2013+ * openjdk-11-jdk
2014+ * openjdk-11-doc
2015+ * openjdk-11-source
2016+>>>>>>> supported
2017diff --git a/supported-desktop-extra b/supported-desktop-extra
2018new file mode 100644
2019index 0000000..564cb7e
2020--- /dev/null
2021+++ b/supported-desktop-extra
2022@@ -0,0 +1,62 @@
2023+This seed exists only to allow fine tuning the 3y support time
2024+
2025+= Dev tools =
2026+
2027+ * gnupg
2028+ * dirmngr
2029+
2030+= Documentation =
2031+ * gnupg-doc
2032+ * manpages-dev
2033+ * tar-doc
2034+
2035+= Additional multimedia =
2036+
2037+ * gstreamer1.0-tools
2038+
2039+= Extra desktop =
2040+
2041+ * libreoffice-nlpsolver
2042+ * libreoffice-officebean
2043+ * libreoffice-style-tango
2044+ * icc-profiles-free
2045+ * vim-gnome
2046+
2047+== Restricted drivers ==
2048+
2049+ * fglrx-amdcccle-updates
2050+ * fglrx-updates-dev
2051+ * nvidia-current-updates
2052+ * nvidia-current-updates-dev
2053+ * nvidia-settings-updates
2054+ * /^libnvidia-cfg1-[0-9]+/
2055+ * /^libnvidia-common-[0-9]+/
2056+ * /^libnvidia-compute-[0-9]+/
2057+ * /^libnvidia-decode-[0-9]+/
2058+ * /^libnvidia-encode-[0-9]+/
2059+ * /^libnvidia-fbc1-[0-9]+/
2060+ * /^libnvidia-gl-[0-9]+/
2061+ * /^libnvidia-ifr1-[0-9]+/
2062+ * /^nvidia-[0-9]+/
2063+ * /^nvidia-driver-[0-9]+/
2064+ * /^nvidia-compute-utils-[0-9]+/
2065+ * /^nvidia-dkms-[0-9]+/
2066+ * /^nvidia-headless-[0-9]+/
2067+ * /^nvidia-headless-no-dkms-[0-9]+/
2068+ * /^nvidia-kernel-common-[0-9]+/
2069+ * /^nvidia-kernel-source-[0-9]+/
2070+ * /^nvidia-[0-9]+-updates/
2071+ * /^nvidia-[0-9]+-dev/
2072+ * /^nvidia-[0-9]+-updates-dev/
2073+ * /^nvidia-experimental-[0-9]+/
2074+ * /^nvidia-experimental-[0-9]+-dev/
2075+ * /^nvidia-settings-experimental-[0-9]+/
2076+ * /^nvidia-settings-[0-9]+-updates/
2077+ * /^nvidia-settings-[0-9]+/
2078+ * /^nvidia-utils-[0-9]+/
2079+ * /^xserver-xorg-video-nvidia-[0-9]+/
2080+
2081+== VM integration ==
2082+
2083+ * open-vm-tools-desktop
2084+
2085diff --git a/supported-kiosk b/supported-kiosk
2086new file mode 100644
2087index 0000000..ea4e35f
2088--- /dev/null
2089+++ b/supported-kiosk
2090@@ -0,0 +1,6 @@
2091+This seed exists to keep some items that may be required for the mir
2092+kiosk / signage project
2093+
2094+= Kiosk =
2095+
2096+ * libmiral-dev # keep MIR in main
2097diff --git a/system-image b/system-image
2098new file mode 100644
2099index 0000000..63f1dec
2100--- /dev/null
2101+++ b/system-image
2102@@ -0,0 +1,46 @@
2103+Task-Section: user
2104+Task-Description: Ubuntu Core Next
2105+Task-Extended-Description: This task provides system image based ubuntu core
2106+Task-Key: ubuntu-core
2107+Task-Name: ubuntu-core
2108+Task-Metapackage: ubuntu-core
2109+
2110+ * Feature: no-follow-recommends
2111+
2112+= Core =
2113+ * ubuntu-core-snapd-units
2114+ * snapd
2115+ * systemd
2116+ * openssh-server
2117+ * xz-utils
2118+ * iptables
2119+ * init
2120+ * initramfs-tools-ubuntu-core
2121+ * grub-pc [i386]
2122+ * grub-efi-ia32-bin [i386]
2123+ * grub-pc-bin [amd64]
2124+ * grub-efi-amd64-signed [amd64]
2125+ * grub-xen-bin [amd64 i386]
2126+ * shim-signed [amd64]
2127+ * cloud-init
2128+ * ca-certificates
2129+ * dbus
2130+ * libpam-systemd
2131+ * apparmor
2132+ * libnss-extrausers
2133+ * wpasupplicant
2134+ * rsyslog
2135+ * seccomp # for scmp_sys_resolver
2136+ * python3-libapparmor # snappy-debug.security needs matching userspace
2137+ * isc-dhcp-client
2138+ * dosfstools
2139+ * ubuntu-fan
2140+ * gdbserver
2141+ * squashfs-tools
2142+ * fwupd
2143+ * fwupd-signed
2144+ * ppp
2145+ * gdisk
2146+ * libnss-myhostname
2147+ * crda
2148+ * netbase
2149diff --git a/wsl b/wsl
2150new file mode 100644
2151index 0000000..9fc6a6c
2152--- /dev/null
2153+++ b/wsl
2154@@ -0,0 +1,17 @@
2155+Packages needed or useful in Windows Subsystem for Linux (WSL) installations.
2156+
2157+The WSL environment is somewhere between a chroot and a container.
2158+The Ubuntu installation runs processes in a root file system separate from the
2159+Windows root file system, but it can interact with the Windows programs sharing
2160+the network interfaces including localhost and via Unix sockets.
2161+
2162+The WSL environment does not need tools for setting up boot and does not run
2163+systemd at the moment.
2164+
2165+== Integration Utilities ==
2166+
2167+ * wslu # utilites for WSL
2168+
2169+= Meta =
2170+
2171+ * ubuntu-wsl # Ubuntu-specific bits we want on every Ubuntu WSL system

Subscribers

People subscribed via source and target branches