Merge ~ubuntukylin-members/ubuntu-seeds/+git/ubuntukylin:drop-mouseemu into ~ubuntu-core-dev/ubuntu-seeds/+git/platform:groovy
- Git
- lp:~ubuntukylin-members/ubuntu-seeds/+git/ubuntukylin
- drop-mouseemu
- Merge into groovy
Proposed by
Steve Langasek
Status: | Rejected |
---|---|
Rejected by: | Steve Langasek |
Proposed branch: | ~ubuntukylin-members/ubuntu-seeds/+git/ubuntukylin:drop-mouseemu |
Merge into: | ~ubuntu-core-dev/ubuntu-seeds/+git/platform:groovy |
Diff against target: |
1098 lines (+963/-0) (has conflicts) 15 files modified
STRUCTURE (+9/-0) blacklist (+71/-0) boot (+3/-0) build-essential (+3/-0) desktop (+208/-0) desktop.minimal-remove (+198/-0) doc/langpacks.txt (+17/-0) installer (+3/-0) live (+50/-0) minimal (+3/-0) required (+3/-0) ship-live (+41/-0) standard (+3/-0) supported (+316/-0) supported-desktop-extra (+35/-0) Conflict in STRUCTURE Conflict in blacklist Conflict in boot Conflict in build-essential Conflict in desktop Conflict in doc/langpacks.txt Conflict in installer Conflict in live Conflict in minimal Conflict in required Conflict in ship-live Conflict in standard Conflict in supported |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Core Development Team | Pending | ||
Review via email: mp+392048@code.launchpad.net |
Commit message
Description of the change
Tracks the change from https:/
To post a comment you must log in.
Revision history for this message
Steve Langasek (vorlon) wrote : | # |
Unmerged commits
- cd15004... by Steve Langasek
-
drop mouseemu, following Ubuntu
- 2e95a03... by handsome_feng
-
Add desktop.
minimal- remove - 648ff43... by handsome_feng
-
Ship nvidia drivers and amd64-microcode in the live pool
- 0255bf0... by Olivier Tilloy
-
Replace gvfs-bin (being removed in groovy) by libglib2.0-bin (for `gio open`).
- 98b551f... by handsome_feng
-
Drop fcitx-ui-qimpanel, baobab and gnome-system-log
- 5db513d... by handsome_feng
-
Drop grub and grub-efi [amd64]; add shim-signed [amd64]; add zsys
- 7a6def7... by Ćukasz Zemczak
-
platform.focal -> platform.groovy
- 9003c28... by handsome_feng
-
Add qt5-ukui-
platformtheme to desktop recommend; format the zfs stuff in live - 725615a... by handsome_feng
-
Drop fcitx-pinyin, fcitx-table-wubi since we have googlepinyin; drop chromium since we have firefox
- d67eb21... by handsome_feng
-
Add zfs support
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/STRUCTURE b/STRUCTURE |
2 | index 22cc1c0..0d31d14 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 | @@ -34,3 +35,11 @@ supported-sysadmin-server: standard |
11 | supported-server: supported-misc-servers supported-hardware-common supported-hardware-server supported-installer-common supported-installer-server supported-network-common supported-sysadmin-common supported-sysadmin-server build-essential supported-development-common supported-kernel-common supported-cloud supported-maas supported-landscape supported-openstack |
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.groovy |
16 | +desktop: desktop-common |
17 | +live: desktop live-common |
18 | +ship-live: boot live |
19 | +# make sure supported remains the last entry |
20 | +supported: desktop ship-live supported-common language-packs |
21 | +>>>>>>> STRUCTURE |
22 | diff --git a/blacklist b/blacklist |
23 | new file mode 100644 |
24 | index 0000000..7812dd4 |
25 | --- /dev/null |
26 | +++ b/blacklist |
27 | @@ -0,0 +1,71 @@ |
28 | +<<<<<<< blacklist |
29 | +======= |
30 | +# blacklist: gnome1 |
31 | +# We want to avoid shipping GNOME 1.x components if possible |
32 | +gconf |
33 | +libxml |
34 | +libcapplet |
35 | +gnome-bin |
36 | +gnome-libs |
37 | + |
38 | +# blacklist: unity |
39 | +# We don't use unity, and use ukui-greeter |
40 | +unity-greeter |
41 | +unity-control-center |
42 | + |
43 | +# blacklist: misc |
44 | +# Packages which are pulled in incidentally (typically by build-dependencies) |
45 | +# and could be trivially replaced with something that we ship |
46 | + |
47 | +# java-common build-depends |
48 | +#dpsyco |
49 | +# various build-depends, pulls in lua, consider standarizing html->text |
50 | +#elinks |
51 | +# could be removed by getting rid of CHILL, which nothing uses |
52 | +gcc-2.95 |
53 | +# tcl8.3 and tcl8.4 is more than enough, consider dropping tcl8.3 too |
54 | +tcl8.0 |
55 | +# no one actually uses this anymore |
56 | +#zephyr |
57 | +# mdz, 2004-06-15: only pulled in by vim |
58 | +ruby1.8 |
59 | + |
60 | +# blacklist: security |
61 | +# |
62 | +# Packages which are not supportable from a security standpoint |
63 | +# |
64 | + |
65 | +## mdz: Packages noticed in 2004-06-14 review of germinate output |
66 | +uw-imap |
67 | +# We shall only ship current kernel-source |
68 | +kernel-source-2.4.22 |
69 | +kernel-source-2.4.23 |
70 | +kernel-source-2.4.24 |
71 | +kernel-source-2.4.25 |
72 | +kernel-source-2.2.25 |
73 | +# results in lots of unwanted setuid-ness; modern stuff uses X or fb |
74 | +svgalib |
75 | +# we ship server software with TLS built-in |
76 | +stunnel |
77 | + |
78 | +# mdz, 2004-06-15 |
79 | +apache |
80 | + |
81 | +## Packages which haven't shown up yet; make sure they don't sneak in |
82 | + |
83 | +# mdz, 2004-06-14: many, many bugs and unmaintained (both debian and upstream) |
84 | +metamail |
85 | +# mdz, 2004-06-14: lots of unsafe string handling, CVE-2002-0789, |
86 | +# CAN-2003-0436, CAN-2003-0437 |
87 | +mnogosearch |
88 | +# mdz, 2004-06-14: requires no explanation |
89 | +wu-ftpd |
90 | +# mdz, 2004-06-14: CAN-2003-0781, unmaintained upstream, Debian#210444 |
91 | +ecartis |
92 | +# mdz, 2004-06-14: lots of DoS and other badness, CAN-2003-0946, CAN-2004-0270, |
93 | +# debian#209084 |
94 | +clamav |
95 | +# mdz, 2004-06-14: upstream deliberately obfuscates vulnerabilities |
96 | +# mdz, 2004-06-20: CAN-2002-0757, CAN-2003-0101, SNS 74, SNS 75 |
97 | +webmin |
98 | +>>>>>>> blacklist |
99 | diff --git a/boot b/boot |
100 | index cf1dd20..e35392a 100644 |
101 | --- a/boot |
102 | +++ b/boot |
103 | @@ -1,3 +1,4 @@ |
104 | +<<<<<<< boot |
105 | = Kernels and Bootloaders = |
106 | |
107 | The default kernels and bootloaders are not to be installed by debootstrap, |
108 | @@ -44,3 +45,5 @@ restricted modules. |
109 | 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 ...) |
110 | |
111 | * mawk |
112 | +======= |
113 | +>>>>>>> boot |
114 | diff --git a/build-essential b/build-essential |
115 | index f51f613..cc5efb1 100644 |
116 | --- a/build-essential |
117 | +++ b/build-essential |
118 | @@ -1,3 +1,4 @@ |
119 | +<<<<<<< build-essential |
120 | * Feature: no-follow-recommends |
121 | |
122 | This seed is used to implement the debootstrap buildd variant. |
123 | @@ -10,3 +11,5 @@ This seed is used to implement the debootstrap buildd variant. |
124 | * libc6-dev [!alpha !ia64] |
125 | * libc6.1-dev [alpha ia64] |
126 | * make |
127 | +======= |
128 | +>>>>>>> build-essential |
129 | diff --git a/desktop b/desktop |
130 | new file mode 100644 |
131 | index 0000000..eeeb3e5 |
132 | --- /dev/null |
133 | +++ b/desktop |
134 | @@ -0,0 +1,208 @@ |
135 | +<<<<<<< desktop |
136 | +======= |
137 | +Task-Per-Derivative: 1 |
138 | +Task-Section: user |
139 | +Task-Description: Ubuntu Kylin desktop |
140 | +Task-Extended-Description: This task provides the Ubuntu Kylin desktop environment. |
141 | +Task-Key: ubuntukylin-desktop |
142 | +Task-Seeds: desktop-common |
143 | + |
144 | += Hardware and Architecture Support = |
145 | + |
146 | +== Architecture-independent == |
147 | + |
148 | +Bluetooth: |
149 | + |
150 | + * (blueman) # desktop bluetooth support |
151 | + |
152 | += Network Services = |
153 | + |
154 | +Basic network services, VPN and Windows integration. |
155 | + |
156 | + * (avahi-autoipd) # IPv4 link-local interface configuration support |
157 | + * (network-manager-gnome) # see NetworkRoaming spec |
158 | + * (network-manager-pptp-gnome) |
159 | + * (libproxy1-plugin-gsettings) |
160 | + * (libproxy1-plugin-networkmanager) |
161 | + * (ppp) # ppp utilities useful to be on a CD when someone needs them |
162 | + * (pppconfig) |
163 | + * (pppoeconf) |
164 | + * (kylin-nm) |
165 | + * (net-tools) |
166 | + |
167 | += GUI infrastructure = |
168 | + |
169 | + * (xterm) |
170 | + * (mate-notification-daemon) |
171 | + |
172 | +Input methods: |
173 | + |
174 | + * (im-config) |
175 | + * (fcitx) |
176 | + * (fcitx-frontend-gtk2) |
177 | + * (fcitx-frontend-gtk3) |
178 | + * (fcitx-frontend-qt5) |
179 | + * (fcitx-ui-classic) |
180 | + * (fcitx-table) |
181 | + * (fcitx-module-cloudpinyin) |
182 | + * (fcitx-googlepinyin) |
183 | + |
184 | += Desktop apps = |
185 | + |
186 | +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. |
187 | + |
188 | + * (apport-gtk) |
189 | + * (whoopsie) |
190 | + * (thunderbird) |
191 | + * (thunderbird-gnome-support) |
192 | + * lightdm |
193 | + * (app-install-data-partner) |
194 | + * (transmission-gtk) |
195 | + * (system-config-printer) |
196 | + * (gnome-font-viewer) |
197 | + * (gucharmap) |
198 | + * language-selector-gnome |
199 | + * (firefox) |
200 | + * (xul-ext-ubufox) |
201 | + * (rhythmbox) |
202 | + * (cheese) |
203 | + * software-properties-gtk |
204 | +# * (totem) # Ubuntu Kylin remove |
205 | + * ubuntu-release-upgrader-gtk |
206 | + * update-manager |
207 | + * update-notifier |
208 | + * yelp |
209 | + * zenity |
210 | + * (xdg-utils) # useful utilities |
211 | + * xdg-user-dirs |
212 | + * xdg-user-dirs-gtk |
213 | + * pulseaudio |
214 | + * (pulseaudio-module-bluetooth) |
215 | + * (libglib2.0-bin) # mostly used as xdg-open backend (gio open) |
216 | + * (gvfs-fuse) # let non-GNOME apps see GVFS via fuse |
217 | + * (gnome-disk-utility) |
218 | + * (simple-scan) |
219 | + * (remmina) |
220 | + * (shotwell) |
221 | + * (usb-creator-gtk) [i386 amd64] |
222 | + * (deja-dup) |
223 | + * xdiagnose |
224 | + * libcanberra-pulse |
225 | + |
226 | +Software center |
227 | + * (ubuntu-kylin-software-center) |
228 | + |
229 | += Key management and signing = |
230 | + |
231 | + * (gnome-keyring) |
232 | + * (seahorse) |
233 | + * (libpam-gnome-keyring) |
234 | + |
235 | +We use gnupg's pinentry support as of wily, instead of gnome-keyring as before. |
236 | + |
237 | + * (gnupg-agent) |
238 | + |
239 | +Games: We only ship a few by default. |
240 | + * (aisleriot) |
241 | + * (gnome-mahjongg) |
242 | + * (gnome-mines) |
243 | + * (gnome-sudoku) |
244 | + * (branding-ubuntu) # Ubuntu branding for some games |
245 | + |
246 | +Default office suite: libreoffice |
247 | + |
248 | + * (libreoffice-style-breeze) |
249 | + * (libreoffice-gnome) |
250 | + * (libreoffice-writer) |
251 | + * (libreoffice-calc) |
252 | + * (libreoffice-impress) |
253 | + * (libreoffice-math) |
254 | + * (libreoffice-ogltrans) |
255 | + * (libreoffice-pdfimport) |
256 | + |
257 | +Themes: we will ship only the very best looking themes. We won't ship everything that Debian ships, just a custom package that includes the themes we want. These packages are included for size guidance until we have Ubuntu-specific packages. |
258 | + |
259 | + * ubuntu-artwork |
260 | + * ubuntu-sounds |
261 | + * gnome-session-canberra # Needed to make login/logout sounds audible. |
262 | + * dmz-cursor-theme |
263 | + |
264 | +Boot theme |
265 | + |
266 | + * (plymouth-theme-ubuntu-logo) |
267 | + |
268 | +Fonts |
269 | + |
270 | + * (fonts-noto) |
271 | + * (fonts-noto-color-emoji) |
272 | + |
273 | +Settings: we have some settings overrides by default in an unique package. |
274 | + * ubuntu-settings |
275 | + * ubuntukylin-default-settings # Ubuntu Kylin add |
276 | + |
277 | +The gstreamer1.0 packages we want to install: |
278 | + |
279 | + * gstreamer1.0-alsa |
280 | + * gstreamer1.0-plugins-base-apps |
281 | + * gstreamer1.0-pulseaudio |
282 | + |
283 | +Accessibility tools: |
284 | + |
285 | + * (gnome-accessibility-themes) |
286 | + * (orca) |
287 | + * (onboard) |
288 | + * (brltty) |
289 | + * (xcursor-themes) |
290 | + * (speech-dispatcher) |
291 | + * (mousetweaks) |
292 | + * at-spi2-core |
293 | + * libatk-adaptor |
294 | + |
295 | += Documentation = |
296 | + |
297 | + * doc-base # integrates with scrollkeeper |
298 | + * (ubuntu-kylin-docs) # Ubuntu Kylin add |
299 | + |
300 | += Other = |
301 | + |
302 | + * ubuntukylin-desktop # metapackage for everything here |
303 | +# * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent) #ubuntukylin remove |
304 | + * (libwmf0.2-7-gtk) |
305 | + |
306 | += Ubuntu Kylin = |
307 | + * ukui-greeter |
308 | + * (youker-assistant) |
309 | + * ubuntukylin-wallpapers |
310 | + * ubuntukylin-keyring |
311 | + * (firefox-locale-zh-hans) |
312 | + * (thunderbird-locale-zh-hans) |
313 | + * (thunderbird-locale-zh-cn) |
314 | + * (libreoffice-l10n-zh-cn) |
315 | + * ubuntukylin-theme |
316 | + * (indicator-china-weather) |
317 | + * ukui-desktop-environment |
318 | + * ukui-menu |
319 | + * ukui-session-manager |
320 | + * ukui-control-center |
321 | + * ukui-screensaver |
322 | + * peony |
323 | + * ukwm |
324 | + * ukui-media |
325 | + * ukui-panel |
326 | + * ukui-sidebar |
327 | + * ukui-settings-daemon |
328 | + * ukui-power-manager |
329 | + * (kylin-display-switch) |
330 | + * (ukui-window-switch) |
331 | + * (kylin-burner) |
332 | + * (kylin-video) |
333 | + * ukui-polkit |
334 | + * (qt5-ukui-platformtheme) |
335 | + |
336 | += MATE applications = |
337 | + * (mate-calc) |
338 | + * (pluma) |
339 | + * (mate-system-monitor) |
340 | + * (mate-terminal) |
341 | + * (atril) |
342 | +>>>>>>> desktop |
343 | diff --git a/desktop.minimal-remove b/desktop.minimal-remove |
344 | new file mode 100644 |
345 | index 0000000..1ba5647 |
346 | --- /dev/null |
347 | +++ b/desktop.minimal-remove |
348 | @@ -0,0 +1,198 @@ |
349 | +# This is a list of packages to be removed when the 'minimal' option is |
350 | +# selected during installation. |
351 | + |
352 | +# Note that the format is NOT the same as the usual seed format. This file is |
353 | +# not processed by germinate - it is simply downloaded during image builds. |
354 | + |
355 | +# kylin-video |
356 | + |
357 | +kylin-video |
358 | +mplayer |
359 | +mpv |
360 | +libavdevice58 |
361 | +liblua5.2-0 |
362 | +libdc1394-22 |
363 | +libdvdnav4 |
364 | +libopenal1 |
365 | +libopenal-data |
366 | +libsdl2-2.0-0 |
367 | +libsndio7.0 |
368 | +libva-wayland2 |
369 | + |
370 | +# youtube-dl |
371 | + |
372 | +ffmpeg |
373 | +libavresample4 |
374 | +libqt5core5a |
375 | +libqt5gui5 |
376 | +libqt5svg5 |
377 | +libqt5network5 |
378 | +libqt5positioning5 |
379 | +libqt5printsupport5 |
380 | +libqt5qml5 |
381 | +libqt5quick5 |
382 | +libqt5sensors5 |
383 | +libqt5webchannel5 |
384 | +libqt5webkit5 |
385 | +libqt5widgets5 |
386 | +phantomjs |
387 | +python3-pyxattr |
388 | +rtmpdump |
389 | +youtube-dl |
390 | + |
391 | +# Deja Dup |
392 | + |
393 | +deja-dup |
394 | +deja-dup-caja |
395 | +duplicity |
396 | +gir1.2-caja-2.0 |
397 | +gir1.2-gtk-3.0 |
398 | +libgoa-1.0-0b |
399 | +libnautilus-extension1a |
400 | +librsync1 |
401 | +librsync2 |
402 | +python3-bcrypt |
403 | +python3-fasteners |
404 | +python3-future |
405 | +python3-lib2to3 |
406 | +python3-lockfile |
407 | +python3-monotonic |
408 | +python3-paramiko |
409 | + |
410 | +# Documentation |
411 | + |
412 | +ubuntu-kylin-docs |
413 | + |
414 | +# GNOME Disks |
415 | + |
416 | +cracklib-runtime |
417 | +gnome-disk-utility |
418 | +libcrack2 |
419 | +libpwquality-common |
420 | +libpwquality1 |
421 | + |
422 | +# GUFW |
423 | + |
424 | +gufw |
425 | + |
426 | +# LibreOffice |
427 | + |
428 | +fonts-liberation2 |
429 | +fonts-opensymbol |
430 | +gstreamer1.0-gtk3 |
431 | +libabw-0.1-1 |
432 | +libboost-date-time1.67.0 |
433 | +libboost-filesystem1.67.0 |
434 | +libboost-iostreams1.67.0 |
435 | +libboost-locale1.67.0 |
436 | +libboost-system1.67.0 |
437 | +libboost-thread1.67.0 |
438 | +libcdr-0.1-1 |
439 | +libclucene-core1v5 |
440 | +libclucene-contribs1v5 |
441 | +libcmis-0.5-5v5 |
442 | +libcolamd2 |
443 | +libe-book-0.1-1 |
444 | +libeot0 |
445 | +libepubgen-0.1-1 |
446 | +libetonyek-0.1-1 |
447 | +libexttextcat-2.0-0 |
448 | +libexttextcat-data |
449 | +libfreehand-0.1-1 |
450 | +libgpgmepp6 |
451 | +liblangtag-common |
452 | +liblangtag1 |
453 | +libmhash2 |
454 | +libmspub-0.1-1 |
455 | +libmwaw-0.3-3 |
456 | +libmythes-1.2-0 |
457 | +libneon27-gnutls |
458 | +libodfgen-0.1-1 |
459 | +liborcus-0.14-0 |
460 | +libpagemaker-0.0-0 |
461 | +libraptor2-0 |
462 | +librasqal3 |
463 | +librdf0 |
464 | +librevenge-0.0-0 |
465 | +libsuitesparseconfig5 |
466 | +libvisio-0.1-1 |
467 | +libwpd-0.10-10 |
468 | +libwpg-0.3-3 |
469 | +libwps-0.4-4 |
470 | +libxmlsec1 |
471 | +libxmlsec1-nss |
472 | +libyajl2 |
473 | +libreoffice-avmedia-backend-gstreamer |
474 | +libreoffice-base-core |
475 | +libreoffice-calc |
476 | +libreoffice-common |
477 | +libreoffice-core |
478 | +libreoffice-draw |
479 | +libreoffice-gnome |
480 | +libreoffice-gtk3 |
481 | +libreoffice-impress |
482 | +libreoffice-l10n-zh-cn |
483 | +libreoffice-math |
484 | +libreoffice-ogltrans |
485 | +libreoffice-pdfimport |
486 | +libreoffice-style-colibre |
487 | +libreoffice-style-elementary |
488 | +libreoffice-style-galaxy |
489 | +libreoffice-style-tango |
490 | +libreoffice-writer |
491 | +lp-solve |
492 | +python3-uno |
493 | +uno-libs3 |
494 | +ure |
495 | + |
496 | +# Rhythmbox |
497 | + |
498 | +gir1.2-gst-plugins-base-1.0 |
499 | +gir1.2-gstreamer-1.0 |
500 | +gir1.2-rb-3.0 |
501 | +libdmapsharing-3.0-2 |
502 | +libgom-1.0-0 |
503 | +libgpod-common |
504 | +libgpod4 |
505 | +libgrilo-0.3-0 |
506 | +liblirc-client0 |
507 | +libsgutils2-2 |
508 | +librhythmbox-core10 |
509 | +libtotem-plparser18 |
510 | +libtotem-plparser-common |
511 | +media-player-info |
512 | +python3-mako |
513 | +python3-markupsafe |
514 | +rhythmbox |
515 | +rhythmbox-data |
516 | +rhythmbox-plugin-alternative-toolbar |
517 | +rhythmbox-plugins |
518 | + |
519 | +# Seahorse |
520 | + |
521 | +seahorse |
522 | + |
523 | +# Transmission |
524 | + |
525 | +libcurl4 |
526 | +libevent-2.1-6 |
527 | +libminiupnpc17 |
528 | +libnatpmp1 |
529 | +transmission-common |
530 | +transmission-gtk |
531 | + |
532 | +# Shotwell |
533 | + |
534 | +libexiv2-14 |
535 | +libgexiv2-2 |
536 | +libraw19 |
537 | +shotwell |
538 | +shotwell-common |
539 | + |
540 | +# Simple Scan |
541 | + |
542 | +simple-scan |
543 | + |
544 | +# indicator-china-weather |
545 | + |
546 | +indicator-china-weather |
547 | diff --git a/doc/langpacks.txt b/doc/langpacks.txt |
548 | index 81c8baa..b234e4c 100644 |
549 | --- a/doc/langpacks.txt |
550 | +++ b/doc/langpacks.txt |
551 | @@ -27,6 +27,7 @@ language and all languages above it. |
552 | The list is vertically ordered by the priority, i. e. they should be |
553 | added from top to down. |
554 | |
555 | +<<<<<<< doc/langpacks.txt |
556 | Input support packages |
557 | ====================== |
558 | |
559 | @@ -39,3 +40,19 @@ language code: |
560 | check-language-support -l ja --show-installed -p ibus |
561 | |
562 | This displays the input methods for Japanese ("ja"). |
563 | +======= |
564 | +Language support on DVDs |
565 | +======================== |
566 | + |
567 | +CDs are generally too small to ship a significant amount of language support |
568 | +packages (spell checkers, etc.), thus we only ship a subset for English there. |
569 | + |
570 | +On DVDs, you should use check-language-support (from the |
571 | +language-selector-common package) to compute the set of langauge support |
572 | +packages which you want to add to DVD ship ("dvd-langsupport") or the DVD live |
573 | +system ("dvd-live-langsupport"). Generate these with this command: |
574 | + |
575 | + 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 |
576 | + |
577 | +Update the list of languages accordingly. |
578 | +>>>>>>> doc/langpacks.txt |
579 | diff --git a/installer b/installer |
580 | index a7135de..2c68722 100644 |
581 | --- a/installer |
582 | +++ b/installer |
583 | @@ -1 +1,4 @@ |
584 | +<<<<<<< installer |
585 | Empty installer seed, in case any other seeds still reference it. |
586 | +======= |
587 | +>>>>>>> installer |
588 | diff --git a/live b/live |
589 | new file mode 100644 |
590 | index 0000000..579138b |
591 | --- /dev/null |
592 | +++ b/live |
593 | @@ -0,0 +1,50 @@ |
594 | +<<<<<<< live |
595 | +======= |
596 | +Task-Per-Derivative: 1 |
597 | +Task-Section: user |
598 | +Task-Description: Ubuntu Kylinlive CD |
599 | +Task-Extended-Description: This task provides the extra packages installed on the Ubuntu Kylin live CD. It is neither useful nor recommended to install this task in other environments. |
600 | +Task-Relevance: 2 |
601 | +Task-Key: ubiquity-frontend-gtk |
602 | +Task-Test-new-install: skip show |
603 | +Task-Seeds: live-common |
604 | + |
605 | + * Languages: en |
606 | + * language-pack-${Languages} |
607 | + * language-pack-gnome-${Languages} |
608 | + |
609 | +# subset of English language support which we want by default: |
610 | +# * libreoffice-help-en-us [i386 amd64] # Ubuntu Kylin remove |
611 | + * hunspell-en-us |
612 | + * wamerican |
613 | + |
614 | + * Languages: zh-hans |
615 | + * language-pack-${Languages} |
616 | + * language-pack-gnome-${Languages} |
617 | + |
618 | +Enough room on i386/powerpc, not enough on amd64: |
619 | +# * Languages: pt de |
620 | +# * language-pack-${Languages} [i386 powerpc] |
621 | +# * language-pack-gnome-${Languages} [i386 powerpc] |
622 | + |
623 | + * gparted |
624 | + * cifs-utils # Needed by casper for CIFS root= |
625 | + |
626 | +== Ubiquity components == |
627 | + |
628 | +These packages make up the Ubiquity live installer. |
629 | + |
630 | + * ubiquity-frontend-gtk |
631 | + * ubiquity-ubuntu-artwork |
632 | +# * ubiquity-slideshow-ubuntu # Ubuntu Kylin remove |
633 | + * ubiquity-slideshow-ubuntukylin # Ubuntu Kylin add |
634 | + |
635 | +== ZFS support === |
636 | + |
637 | + * zfsutils-linux |
638 | + * zfs-initramfs |
639 | + * zsys |
640 | + |
641 | +== Secureboot setup == |
642 | + * shim-signed [amd64] |
643 | +>>>>>>> live |
644 | diff --git a/minimal b/minimal |
645 | index d2b806a..b0c4116 100644 |
646 | --- a/minimal |
647 | +++ b/minimal |
648 | @@ -1,3 +1,4 @@ |
649 | +<<<<<<< minimal |
650 | Task-Section: user |
651 | Task-Relevance: 9 |
652 | Task-Description: Minimal base system |
653 | @@ -61,3 +62,5 @@ These provide various networking services, all should be configured in a client- |
654 | * init # ensure we have an init system (but minimal chroots) |
655 | * ubuntu-minimal # Ubuntu-specific bits we want on every Ubuntu system |
656 | |
657 | +======= |
658 | +>>>>>>> minimal |
659 | diff --git a/required b/required |
660 | index f309b2d..7230208 100644 |
661 | --- a/required |
662 | +++ b/required |
663 | @@ -1,3 +1,4 @@ |
664 | +<<<<<<< required |
665 | 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. |
666 | |
667 | A system containing only required packages is not a supported Ubuntu system; you need to install at least the packages from minimal as well. |
668 | @@ -48,3 +49,5 @@ Other packages necessary to get started: |
669 | * procps |
670 | * sensible-utils # used to be pulled in by debianutils, tons of undeclared deps |
671 | * sysvinit-utils # pidof tool (Debian #810018) and init-d-script for SysV init scripts |
672 | +======= |
673 | +>>>>>>> required |
674 | diff --git a/ship-live b/ship-live |
675 | new file mode 100644 |
676 | index 0000000..9df49f0 |
677 | --- /dev/null |
678 | +++ b/ship-live |
679 | @@ -0,0 +1,41 @@ |
680 | +<<<<<<< ship-live |
681 | +======= |
682 | +The ship-live seed will be added to the live CD as an ordinary package |
683 | +archive. Here belongs anything that somebody might need to install after |
684 | +installing the contents of the live CD in order to get online and fetch more |
685 | +packages. |
686 | + |
687 | +== Hardware & Network Access == |
688 | + |
689 | + * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs |
690 | + * sl-modem-daemon # needed for some Winmodems (see OutoftheboxWinmodem) |
691 | + * intel-microcode # needed to update Intel cpu microcode LP #1386257 |
692 | + * amd64-microcode # needed to update AMD cpu microcode LP #1386257 |
693 | + |
694 | + * libatm1 # suggested by ppp for PPP-over-ATM |
695 | + * setserial # needed by folks with nonstandard serial ports |
696 | + * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems |
697 | + * elfspe2 [powerpc] # SPE access for Cell systems |
698 | + * b43-fwcutter |
699 | + * bcmwl-kernel-source #since we no longer have LRM |
700 | + * wvdial # network-manager should replace this functionality ASAP |
701 | + |
702 | + * /^linux-modules-nvidia-[0-9]+-generic/ |
703 | + * /^nvidia-driver-[0-9]+/ # Needed for networkless installation of graphics drivers |
704 | + |
705 | +== Installer == |
706 | + |
707 | + * grub-efi-amd64-signed [amd64] |
708 | + * grub-efi-arm64 [arm64] |
709 | + * shim-signed [amd64] |
710 | + * oem-config-gtk |
711 | + * oem-config-slideshow-ubuntu |
712 | + * lupin-support [amd64 i386] # installer-for-windows |
713 | + * uboot-mkimage [armel] # needed on dove for uboot |
714 | + |
715 | +== Blacklist == |
716 | + |
717 | +libavcodec cannot be shipped on CDs (c.f. Ubuntu technical board resolution 2007-01-02). |
718 | + |
719 | + * !libavcodec* |
720 | +>>>>>>> ship-live |
721 | diff --git a/standard b/standard |
722 | index bd6a467..25d84eb 100644 |
723 | --- a/standard |
724 | +++ b/standard |
725 | @@ -1,3 +1,4 @@ |
726 | +<<<<<<< standard |
727 | Task-Section: user |
728 | Task-Relevance: 8 |
729 | Task-Description: Standard system |
730 | @@ -85,3 +86,5 @@ These are used for debugging problems or examining the system. |
731 | * ubuntu-standard # metapackage for everything here |
732 | * (apt) # James Westby, enables access to private PPAs among other things |
733 | * language-selector-common # helps installer to work out which language-support packages to install |
734 | +======= |
735 | +>>>>>>> standard |
736 | diff --git a/supported b/supported |
737 | new file mode 100644 |
738 | index 0000000..0c50dfe |
739 | --- /dev/null |
740 | +++ b/supported |
741 | @@ -0,0 +1,316 @@ |
742 | +<<<<<<< supported |
743 | +======= |
744 | +Most of what was formerly in the supported seed is now in the dvd seed. This |
745 | +seed now includes some things that are too big for a DVD, and of course also |
746 | +inherits from everything else. |
747 | + |
748 | += Language support = |
749 | + |
750 | +The following packages also have application translations, but are not |
751 | +using gettext, but a custom format. language-selector will install |
752 | +them as appropriate. |
753 | + |
754 | + * /^evolution-documentation-/ |
755 | + * /^libreoffice-help-/ |
756 | + * /^libreoffice-l10n-/ |
757 | + * /^thunderbird-locale-/ |
758 | + * /^firefox-locale-/ |
759 | + * poppler-data |
760 | +# * ibus-sunpinyin # Ubuntu Kylin remove |
761 | + |
762 | +The following input aids are also installed on demand by |
763 | +language-selector: |
764 | + |
765 | + * libenchant-voikko |
766 | + * libreoffice-voikko |
767 | + * mozvoikko |
768 | + * tmispell-voikko |
769 | + * openoffice.org-hyphenation |
770 | + * /^hyphen-..$/ |
771 | + * hyphen-en-us |
772 | + * /^mythes-/ |
773 | + * /^hunspell-[^-]*$/ |
774 | + * hunspell-eu-es |
775 | + * hunspell-sv-se |
776 | + * hunspell-gl-es |
777 | + * hunspell-br |
778 | + |
779 | +myspell packages containing the hunspell dictionaries: |
780 | + |
781 | + * myspell-af |
782 | + * myspell-bg |
783 | + * myspell-ca |
784 | + * myspell-cs |
785 | + * myspell-el-gr |
786 | + * myspell-en-au |
787 | + * myspell-en-gb |
788 | + * myspell-en-us |
789 | + * myspell-en-za |
790 | + * myspell-eo |
791 | + * myspell-es |
792 | + * myspell-et |
793 | + * myspell-fa |
794 | + * myspell-fo |
795 | + * myspell-ga |
796 | + * myspell-gd |
797 | + * myspell-gv |
798 | + * myspell-he |
799 | + * myspell-hr |
800 | + * myspell-hy |
801 | + * myspell-it |
802 | + * myspell-ku |
803 | + * myspell-lt |
804 | + * myspell-lv |
805 | + * myspell-nb |
806 | + * myspell-nl |
807 | + * myspell-nn |
808 | + * myspell-nr |
809 | + * myspell-ns |
810 | + * myspell-pl |
811 | + * myspell-pt |
812 | + * myspell-sk |
813 | + * myspell-sl |
814 | + * myspell-ss |
815 | + * myspell-st |
816 | + * hunspell-sv-se |
817 | + * myspell-sw |
818 | + * myspell-th |
819 | + * myspell-tn |
820 | + * myspell-ts |
821 | + * myspell-uk |
822 | + * myspell-ve |
823 | + * myspell-xh |
824 | + * myspell-zu |
825 | + |
826 | +Other dictionaries, word lists, and thesauri: |
827 | + |
828 | + * dict-foldoc |
829 | + * dict-gcide |
830 | + * dict-jargon |
831 | + * dict-moby-thesaurus |
832 | + * dict-vera |
833 | + * dictd |
834 | + * mythes-ca |
835 | + * mythes-cs |
836 | + * mythes-de |
837 | + * mythes-de-ch |
838 | + * mythes-en-au |
839 | + * mythes-en-us |
840 | + * mythes-fr |
841 | + * mythes-hu |
842 | + * mythes-it |
843 | + * mythes-ne |
844 | + * mythes-pl |
845 | + * mythes-ro |
846 | + * mythes-ru |
847 | + * mythes-sk |
848 | + * wamerican |
849 | + * wbrazilian |
850 | + * wbritish |
851 | + * wbulgarian |
852 | + * wcatalan |
853 | + * wdanish |
854 | + * wdutch |
855 | + * wfaroese |
856 | + * wfrench |
857 | + * wgalician-minimos |
858 | + * wirish |
859 | + * witalian |
860 | + * wmanx |
861 | + * wngerman |
862 | + * wnorwegian |
863 | + * wogerman |
864 | + * wpolish |
865 | + * wportuguese |
866 | + * wspanish |
867 | + * wswedish |
868 | + * wswiss |
869 | + * wukrainian |
870 | + |
871 | +Fonts installed on demand by language-selector: |
872 | + |
873 | + * fonts-arabeyes |
874 | + * fonts-arphic-ukai |
875 | + * fonts-arphic-uming |
876 | + * fonts-farsiweb |
877 | +# * fonts-kacst # Ubuntu Kylin remove |
878 | + * fonts-khmeros |
879 | +# * fonts-lao # Ubuntu Kylin remove |
880 | + * fonts-manchufont |
881 | + * fonts-mgopen |
882 | + * fonts-nafees |
883 | + * fonts-sil-abyssinica |
884 | + * fonts-sil-ezra |
885 | + * fonts-sil-nuosusil |
886 | + * fonts-sil-padauk |
887 | + * fonts-sil-scheherazade |
888 | +# * fonts-thai-tlwg # Ubuntu Kylin remove |
889 | + * fonts-tibetan-machine |
890 | + * fonts-ukij-uyghur |
891 | + * ttf-alee |
892 | + * ttf-bengali-fonts |
893 | + * ttf-devanagari-fonts |
894 | + * ttf-gujarati-fonts |
895 | + * ttf-kannada-fonts |
896 | + * ttf-malayalam-fonts |
897 | + * ttf-oriya-fonts |
898 | + * ttf-punjabi-fonts |
899 | + * ttf-tamil-fonts |
900 | + * ttf-telugu-fonts |
901 | +# * ttf-wqy-zenhei # deprecated |
902 | + |
903 | +Input methods installed on demand by language-selector: |
904 | + |
905 | + * gtk-im-libthai |
906 | + * ibus-anthy |
907 | + * ibus-chewing |
908 | + * ibus-hangul |
909 | + * ibus-m17n |
910 | + * ibus-sunpinyin |
911 | + * ibus-table-cangjie |
912 | + * ibus-table-wubi |
913 | + * ibus-unikey |
914 | + |
915 | +Transitional packages: |
916 | + |
917 | + |
918 | +Transitional packages for upgrading 12.04.[1-9] with LTS enablement stacks to |
919 | +14.04 (remove them entirely in 14.10): |
920 | + * %xorg-lts-transitional |
921 | + * !xserver-xorg-video-geode-lts-quantal |
922 | + * !xserver-xorg-video-geode-lts-raring |
923 | + * !xserver-xorg-video-geode-lts-saucy |
924 | + * !xserver-xorg-input-mtrack-lts-quantal |
925 | + * !xserver-xorg-input-mtrack-lts-saucy |
926 | + * !xserver-xorg-input-mtrack-lts-raring |
927 | + * !xserver-xorg-input-kbd-lts-quantal |
928 | + * !xserver-xorg-input-kbd-lts-saucy |
929 | + * !xserver-xorg-input-kbd-lts-raring |
930 | + * !xserver-xorg-input-joystick-lts-quantal |
931 | + * !xserver-xorg-input-joystick-lts-saucy |
932 | + * !xserver-xorg-input-joystick-lts-raring |
933 | + * !xserver-xorg-input-joystick-dev-lts-quantal |
934 | + * !xserver-xorg-input-joystick-dev-lts-saucy |
935 | + * !xserver-xorg-input-joystick-dev-lts-raring |
936 | + |
937 | += Installed on demand = |
938 | + |
939 | + * apparmor-utils # AppArmor profile development |
940 | + * apparmor-notify # LP: #893266 |
941 | + * apparmor-profiles |
942 | + * libapache2-mod-apparmor |
943 | + * libpam-apparmor |
944 | + * python-libapparmor |
945 | + * python3-libapparmor |
946 | + * python-ufw |
947 | + * libseccomp-dev # promote its use, LP: #1082431 |
948 | + * auditd |
949 | + |
950 | += Extra server bits = |
951 | + |
952 | + * postgresql-plperl-9.3 |
953 | + * postgresql-plpython-9.3 |
954 | + * postgresql-plpython3-9.3 |
955 | + * postgresql-pltcl-9.3 |
956 | + * hv-kvp-daemon-init |
957 | + * cloud-utils |
958 | + * nginx |
959 | + * joyent-mdata-client |
960 | + * sssd |
961 | + * sssd-tools |
962 | + |
963 | += Rescued from Extra = |
964 | + |
965 | + * Extra-Include: *-dbg *-debug *-dev *-doc *-docs *-gcj gir1.2-* *-examples |
966 | + |
967 | +... and some miscellaneous exclusions for things we don't want to drag in |
968 | +automatically (note that Extra-Exclude *only* prevents packages from being |
969 | +included due to matching Extra-Include patterns, and has no other effect): |
970 | + |
971 | + * Extra-Exclude: libstdc++6-doc libstdc++6-dev libstdc++6-dbg lib*stdc++6-4.1* lib*stdc++6-4.2* lib*stdc++6-4.3* |
972 | + * Extra-Exclude: libgnat*-dev libgnat*-dbg gnat*-doc |
973 | + * Extra-Exclude: gpc*-doc |
974 | + * Extra-Exclude: lib*mudflap* |
975 | + * Extra-Exclude: gfortran-4.1-doc gfortran-4.2-doc gfortran-4.3-doc lib*gfortran1-dbg |
976 | + * Extra-Exclude: lib*go0-dbg |
977 | + * Extra-Exclude: lib*objc1-dbg |
978 | + * Extra-Exclude: lldb-* clang* libclang* libllvm-* |
979 | + * Extra-Exclude: libavformat-dev libpostproc-dev |
980 | + * Extra-Exclude: libgdchart-gd2-xpm-dev |
981 | + * Extra-Exclude: libgdome2-ocaml-dev |
982 | + * Extra-Exclude: libmpich-mpd1.0-dev libmpich-shmem1.0-dev |
983 | + * Extra-Exclude: libnetpbm9-dev |
984 | + * Extra-Exclude: libavahi-compat-howl-dev |
985 | + * Extra-Exclude: libboost-*-dev libboost*-all-dev |
986 | + * Extra-Exclude: libcairo-directfb2-dev |
987 | + * Extra-Exclude: libcdio-*-dev libiso9660-dev |
988 | + * Extra-Exclude: libxaw6* # built from the same source as libxaw7* |
989 | + * Extra-Exclude: nvidia-glx-legacy-dev # nvidia-glx-legacy is unsupportable |
990 | + * Extra-Exclude: python-qt3-gl-dbg # We don't want python-qt3-gl in main |
991 | + * Extra-Exclude: python-qt4-gl python-qt4-gl-dbg # We don't want python-qt4-gl in main |
992 | + * Extra-Exclude: g77-doc # pulls in gcc-3.4 |
993 | + * Extra-Exclude: libkiten-dev |
994 | + * Extra-Exclude: sendmail-doc |
995 | + * Extra-Exclude: mono-dbg # only useful with mono-debugger, currently in universe |
996 | + * Extra-Exclude: python-renderpm-dbg |
997 | + * Extra-Exclude: python-reportlab-accel-dbg # packages aren't in main, -dbg shouldn't cause them to be |
998 | + * Extra-Exclude: libnewlib-dev # not used in main, we only want newlib-spu for powerpc |
999 | + * Extra-Exclude: sendmail-doc # sendmail source is only in main for libmilter |
1000 | + * Extra-Exclude: libgnumail-java-doc # depends on classpath |
1001 | + * Extra-Exclude: libcommons-dbcp-java-doc # depends on classpath |
1002 | + * Extra-Exclude: javacc-doc # depends on classpath |
1003 | + * Extra-Exclude: virtuoso-vad-doc # depends on binaries that were not MIR-approved |
1004 | + * Extra-Exclude: libgl1-mesa-dri-experimental-dbg # LP: #638097 |
1005 | + * Extra-Exclude: python-vigra-doc # libvigraimpex is in main, but nothing uses python-vigra |
1006 | + * Extra-Exclude: asp.net-examples |
1007 | + * Extra-Exclude: packagekit-dbg |
1008 | + * Extra-Exclude: rest-bench-dbg |
1009 | + * Extra-Exclude: grub-coreboot-dbg grub-emu-dbg |
1010 | + * Extra-Exclude: ceph-test-dbg ceph-fs-common-dbg ceph-mds-dbg |
1011 | + * Extra-Exclude: unity-webapps-dev # we don't want its deps in main |
1012 | + * Extra-Exclude: sndfile-programs-dbg # sndfile-programs not in main |
1013 | + * Extra-Exclude: ubuntu-ui-toolkit-examples |
1014 | + * Extra-Exclude: speech-dispatcher-dbg |
1015 | + * Extra-Exclude: nginx-extras-dbg nginx-full-dbg nginx-light-dbg nginx-naxsi-dbg |
1016 | + |
1017 | +Transitional packages: |
1018 | + |
1019 | + * Extra-Exclude: xserver-xorg-video-amd-dbg |
1020 | + |
1021 | +Exclude some KDE-specific pieces: |
1022 | + |
1023 | + * Extra-Exclude: kdebase-dbg |
1024 | + * Extra-Exclude: kdelibs-dbg |
1025 | + * Extra-Exclude: kdelibs4-doc |
1026 | + * Extra-Exclude: kdepim-dbg |
1027 | + * Extra-Exclude: kdesdk-dbg |
1028 | + * Extra-Exclude: libdbus-qt-1-dev |
1029 | + * Extra-Exclude: libdcop3-java-dev |
1030 | + * Extra-Exclude: libindex0-dev |
1031 | + * Extra-Exclude: libpoppler-qt-dev |
1032 | + * Extra-Exclude: libqt4-debug libqt4-debug-dev qt4-doc |
1033 | + * Extra-Exclude: libsmokekde-dev |
1034 | + * Extra-Exclude: python-kde3-dbg |
1035 | + * Extra-Exclude: python-qt3-dbg |
1036 | + * Extra-Exclude: python-qtext-dbg |
1037 | + * Extra-Exclude: qt-x11-free-dbg |
1038 | + |
1039 | +Temporary workarounds: |
1040 | + |
1041 | + * libreoffice-evolution # no rdepends any more, noticed too late |
1042 | + * openjade # (b-d of opensp, avoid component-mismatch on openjade-1.3) |
1043 | + |
1044 | += Build infrastructure = |
1045 | + |
1046 | + * pkgbinarymangler # needs to be in main to stay in the buildd chroots |
1047 | + |
1048 | += Other = |
1049 | + |
1050 | + * icedtea-plugin |
1051 | + * evolution # still supported for business environment |
1052 | + * miscfiles |
1053 | + * sosreport # AdamStokes LP: #1206106 |
1054 | + * nvidia-prime |
1055 | + * fglrx-pxpress |
1056 | + * ipxe |
1057 | +>>>>>>> supported |
1058 | diff --git a/supported-desktop-extra b/supported-desktop-extra |
1059 | new file mode 100644 |
1060 | index 0000000..36d3e97 |
1061 | --- /dev/null |
1062 | +++ b/supported-desktop-extra |
1063 | @@ -0,0 +1,35 @@ |
1064 | +This seed exists only to allow fine tuning the 3y support time |
1065 | + |
1066 | += Dev tools = |
1067 | + |
1068 | + * cdbs |
1069 | + * gnupg2 |
1070 | + |
1071 | += Documentation = |
1072 | + * gnupg-doc |
1073 | + * tar-doc |
1074 | + |
1075 | += Additional multimedia = |
1076 | + |
1077 | + * gstreamer1.0-tools |
1078 | + |
1079 | += Extra desktop = |
1080 | + |
1081 | + * libreoffice-base |
1082 | + * thunderbird-gnome-support |
1083 | + * rhythmbox |
1084 | + * evolution-exchange |
1085 | + * evolution-indicator |
1086 | + * icc-profiles-free |
1087 | + * virt-manager |
1088 | + * xchat-gnome |
1089 | + * vim-gnome |
1090 | + |
1091 | += Command line tools = |
1092 | + |
1093 | + * bittornado |
1094 | + * virtinst |
1095 | + |
1096 | += Certification = |
1097 | + |
1098 | + * lsb |
(targeted wrong branch; change has been properly merged)