diff --git a/STRUCTURE b/STRUCTURE index 3607e8e..b708827 100644 --- a/STRUCTURE +++ b/STRUCTURE @@ -1,17 +1,21 @@ include platform.yakkety feature no-follow-recommends -core: core-gtk -core-gtk: standard -core-qt: standard +core: core-gtk core-share +core-gtk: core-share +core-qt: core-share +core-share: standard desktop: core desktop-gtk desktop-gtk: core-gtk standard desktop-qt: core-qt standard -live: desktop live-common -live-gtk: desktop-gtk live-common -live-qt: desktop-qt live-common +desktop-share: core-share standard +live: desktop live-share live-common +live-gtk: desktop-gtk live-share live-common +live-qt: desktop-qt live-share live-common +live-share: live-common ship: boot installer desktop d-i-requirements -ship-live: ship-live-gtk -ship-live-gtk: boot live -ship-live-qt: boot live +ship-live: ship-live-gtk ship-share +ship-live-gtk: ship-share boot live +ship-live-qt: ship-share boot live +ship-share: boot live # make sure supported remains the last entry supported: core desktop ship-live supported-common diff --git a/core b/core index be48ff6..1ccf3a3 100644 --- a/core +++ b/core @@ -5,28 +5,10 @@ Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubun Task-Key: lubuntu-core Task-Name: lubuntu-core Task-Metapackage: lubuntu-core -Task-Seeds: core-gtk +Task-Seeds: core-gtk core-share * Feature: no-follow-recommends -= LXDE / LXQt core packages = - - * openbox - -= Lubuntu core packages = - - * lubuntu-default-settings - * lubuntu-artwork - * plymouth-theme-lubuntu-logo - * plymouth-theme-lubuntu-text - -= Other needed packages = - - * dbus-x11 - -= X = - - * xserver-xorg-video-all # Depend on the driver-all packages, xorg doesn't provide them - * xserver-xorg-input-all # and desktop-common seed only recommend them. LP: #1441843 - * xserver-xorg-video-intel # Not installed by default, better for old Intel cards += Meta-package = + * lubuntu-core diff --git a/core-gtk b/core-gtk index b95b454..7fbf5e8 100644 --- a/core-gtk +++ b/core-gtk @@ -5,6 +5,7 @@ Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubun Task-Key: lubuntu-gtk-core Task-Name: lubuntu-gtk-core Task-Metapackage: lubuntu-gtk-core +Task-Seeds: core-share * Feature: no-follow-recommends @@ -15,9 +16,6 @@ Task-Metapackage: lubuntu-gtk-core * lxsession * lxterminal -= Artwork (to provide icons packages = - * lubuntu-icon-theme - = Other needed packages = * lightdm * lightdm-gtk-greeter diff --git a/core-qt b/core-qt index f3d62a3..d06e3d5 100644 --- a/core-qt +++ b/core-qt @@ -5,6 +5,7 @@ Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubun Task-Key: lubuntu-qt-core Task-Name: lubuntu-qt-core Task-Metapackage: lubuntu-qt-core +Task-Seeds: core-share * Feature: no-follow-recommends @@ -16,9 +17,6 @@ Task-Metapackage: lubuntu-qt-core * lxqt-session * qterminal -= Artwork (to provide icons packages = - * lubuntu-icon-theme - = Display manager = * sddm * sddm-theme-lubuntu-chooser diff --git a/core-share b/core-share new file mode 100644 index 0000000..2afd41b --- /dev/null +++ b/core-share @@ -0,0 +1,31 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu minimal installation (shared pacakges) +Task-Extended-Description: This task provides shared packages for minimal installation of Lubuntu. +Task-Key: lubuntu-core-share +Task-Name: lubuntu-core-share + + * Feature: no-follow-recommends + + += LXDE / LXQt core packages = + + * openbox + += Lubuntu core packages = + + * lubuntu-default-settings + * lubuntu-artwork + * lubuntu-icon-theme + * plymouth-theme-lubuntu-logo + * plymouth-theme-lubuntu-text + += Other needed packages = + + * dbus-x11 + += X = + + * xserver-xorg-video-all # Depend on the driver-all packages, xorg doesn't provide them + * xserver-xorg-input-all # and desktop-common seed only recommend them. LP: #1441843 + * xserver-xorg-video-intel # Not installed by default, better for old Intel cards diff --git a/desktop b/desktop index c60f026..79d6b9e 100644 --- a/desktop +++ b/desktop @@ -5,7 +5,7 @@ Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environme Task-Key: lubuntu-desktop Task-Name: lubuntu-desktop Task-Metapackage: lubuntu-desktop -Task-Seeds: desktop-gtk +Task-Seeds: desktop-gtk desktop-share * Feature: no-follow-recommends @@ -14,114 +14,5 @@ Task-Seeds: desktop-gtk * lubuntu-desktop-gtk * lubuntu-core -== LXDE / LXQt common components == - - * libfm-modules - -== Multimedia == - - * audacious [!powerpc] - * audacious-plugins [!powerpc] - * libmtp-runtime # needed by libmtp9 (normally seeded through recommends LP: #1061430) - * ffmpegthumbnailer # For videos thumbnails - -== Desktopish tools which we do need == - - * desktop-file-utils # map MIME types to apps - * xdg-user-dirs # to add the Desktop directory - * gvfs-fuse # for access of non gio applications to gvfs mounts - * gvfs-backends # for adding support for backends (photos, network etc ...) to gvfs - * ntp # Add support for synchronisation with time servers - * compton - -== Archive support == - -# Add more type of archive support - * xz-utils - * zip - * unzip # also used for .zip support in file-roller - -== Artwork and Look & Feel == - - * dmz-cursor-theme # LP: #923344 - -== Printing == - - * cups-driver-gutenprint - * cups # our preferred printer management infrastructure - * cups-bsd # gives us lpc, lpq, lpr, lprm - * cups-client # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove - * foomatic-db-compressed-ppds # the foomatic printer driver database - * cups-filters - * openprinting-ppds # Most common drivers we want in desktop; less common are in o-p-extra - * printer-driver-pnm2ppa # several ppds require this - * ghostscript-x - * hplip # support for HP all-in-one printers - * printer-driver-min12xxw # support for KonicaMinolta PagePro 1200W, 1300W printers - * printer-driver-foo2zjs # support for printing to ZjStream-based printers - * printer-driver-splix # support for Samsung lasers - * printer-driver-pxljr # support for HP Color lasers - * printer-driver-c2esp # support for Kodak injket printers - * printer-driver-ptouch # support for Brother P-touch printers - * printer-driver-sag-gdi # support for Rico Aficio SPxxxx printers - * printer-driver-brlaser # support for some Brother laser printers - -== Sound == - - * alsa-base # needed for proper hardware detection (hotplug/blacklist.d, modprobe.d) - * alsa-utils # basic audio support and mixer level handling - -== Terminal tools (from desktop-common) == - - * bc - * genisoimage - -== Networking == - - * wvdial - * modemmanager # Add support for mobile modem LP: #967132 - * mobile-broadband-provider-info # LP: #975139 - * usb-modeswitch # LP: #979304 - * wireless-tools - * rfkill # No longer using the copy from wireless-tools (LP: #715309) - * wpasupplicant # ScottJamesRemnant - * libnss-mdns # IPv4 link-local DNS support - * ca-certificates # common SSL certificates - -== Low level system plumbery == - - * pm-utils # Add to support suspend in some case. - * acpi-support - * laptop-detect - * update-notifier # For crash report and updates notifications - * ubuntu-drivers-common # Make it harder to remove detection support, LP#704597 - * policykit-desktop-privileges # passwordless disk/CPU speed/time operations for admins - * libpam-systemd # logind, cross desktop compatibility - * x11-utils - * whoopsie # LP: 1001630 - * kerneloops-daemon # watch for and allow reporting of kernel problems - - * fonts-noto-cjk # Extra font to display asian characters - * fonts-nanum # LP: #1437875 - - * pcmciautils # PCMCIA support for >= 2.6.13-rc1 kernels - * inputattach # needed for serial mice - * libsasl2-modules # allows integration with MTA and login system - - * fcitx - - * xkb-data - - * memtest86+ - - * anacron # generally appropriate for desktops - - * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead - -== Specific == - - * apmd [armel] - * pbbuttonsd [powerpc] - -== Other == +== Metapackage == * lubuntu-desktop # metapackage for everything here diff --git a/desktop-gtk b/desktop-gtk index c36a498..03eb71e 100644 --- a/desktop-gtk +++ b/desktop-gtk @@ -5,7 +5,7 @@ Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environme Task-Key: lubuntu-gtk-desktop Task-Name: lubuntu-gtk-desktop Task-Metapackage: lubuntu-gtk-desktop -Task-Seeds: core-gtk +Task-Seeds: desktop-share core-gtk * Feature: no-follow-recommends diff --git a/desktop-qt b/desktop-qt index 2e1516c..eef8cbc 100644 --- a/desktop-qt +++ b/desktop-qt @@ -5,7 +5,7 @@ Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXQt environme Task-Key: lubuntu-qt-desktop Task-Name: lubuntu-qt-desktop Task-Metapackage: lubuntu-qt-desktop -Task-Seeds: core-qt +Task-Seeds: desktop-share core-qt * Feature: no-follow-recommends diff --git a/desktop-share b/desktop-share new file mode 100644 index 0000000..f48d756 --- /dev/null +++ b/desktop-share @@ -0,0 +1,121 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu Desktop (shared packages) +Task-Extended-Description: This task provides the shared packaged for Lubuntu. +Task-Key: lubuntu-desktop-share +Task-Name: lubuntu-desktop-share +Task-Seeds: core-share + + * Feature: no-follow-recommends + +== Default seeds == + + * lubuntu-core + +== LXDE / LXQt common components == + + * libfm-modules + +== Multimedia == + + * audacious [!powerpc] + * audacious-plugins [!powerpc] + * libmtp-runtime # needed by libmtp9 (normally seeded through recommends LP: #1061430) + * ffmpegthumbnailer # For videos thumbnails + +== Desktopish tools which we do need == + + * desktop-file-utils # map MIME types to apps + * xdg-user-dirs # to add the Desktop directory + * gvfs-fuse # for access of non gio applications to gvfs mounts + * gvfs-backends # for adding support for backends (photos, network etc ...) to gvfs + * ntp # Add support for synchronisation with time servers + +== Archive support == + +# Add more type of archive support + * xz-utils + * zip + * unzip # also used for .zip support in file-roller + +== Artwork and Look & Feel == + + * dmz-cursor-theme # LP: #923344 + +== Printing == + + * cups-driver-gutenprint + * cups # our preferred printer management infrastructure + * cups-bsd # gives us lpc, lpq, lpr, lprm + * cups-client # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove + * foomatic-db-compressed-ppds # the foomatic printer driver database + * cups-filters + * openprinting-ppds # Most common drivers we want in desktop; less common are in o-p-extra + * printer-driver-pnm2ppa # several ppds require this + * ghostscript-x + * hplip # support for HP all-in-one printers + * printer-driver-min12xxw # support for KonicaMinolta PagePro 1200W, 1300W printers + * printer-driver-foo2zjs # support for printing to ZjStream-based printers + * printer-driver-splix # support for Samsung lasers + * printer-driver-pxljr # support for HP Color lasers + * printer-driver-c2esp # support for Kodak injket printers + * printer-driver-ptouch # support for Brother P-touch printers + * printer-driver-sag-gdi # support for Rico Aficio SPxxxx printers + * printer-driver-brlaser # support for some Brother laser printers + +== Sound == + + * alsa-base # needed for proper hardware detection (hotplug/blacklist.d, modprobe.d) + * alsa-utils # basic audio support and mixer level handling + +== Terminal tools (from desktop-common) == + + * bc + * genisoimage + +== Networking == + + * wvdial + * modemmanager # Add support for mobile modem LP: #967132 + * mobile-broadband-provider-info # LP: #975139 + * usb-modeswitch # LP: #979304 + * wireless-tools + * rfkill # No longer using the copy from wireless-tools (LP: #715309) + * wpasupplicant # ScottJamesRemnant + * libnss-mdns # IPv4 link-local DNS support + * ca-certificates # common SSL certificates + +== Low level system plumbery == + + * pm-utils # Add to support suspend in some case. + * acpi-support + * laptop-detect + * update-notifier # For crash report and updates notifications + * ubuntu-drivers-common # Make it harder to remove detection support, LP#704597 + * policykit-desktop-privileges # passwordless disk/CPU speed/time operations for admins + * libpam-systemd # logind, cross desktop compatibility + * x11-utils + * whoopsie # LP: 1001630 + * kerneloops-daemon # watch for and allow reporting of kernel problems + + * fonts-noto-cjk # Extra font to display asian characters + * fonts-nanum # LP: #1437875 + + * pcmciautils # PCMCIA support for >= 2.6.13-rc1 kernels + * inputattach # needed for serial mice + * libsasl2-modules # allows integration with MTA and login system + + * fcitx + + * xkb-data + + * memtest86+ + + * anacron # generally appropriate for desktops + + * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead + +== Specific == + + * apmd [armel] + * pbbuttonsd [powerpc] diff --git a/live b/live index 77d2b62..f89d4ca 100644 --- a/live +++ b/live @@ -5,26 +5,9 @@ Task-Extended-Description: This task provides the extra packages installed on th Task-Relevance: 2 Task-Key: ubiquity-frontend Task-Test-new-install: skip show -Task-Seeds: live-gtk +Task-Seeds: live-gtk live-share == Languages support == * Languages: en * language-pack-${Languages} - -== Ubiquity components == - -These packages make up the Ubiquity live installer. - - * ubiquity-slideshow-lubuntu - -== Lubuntu specifics == - - * lubuntu-live-settings # Add specific settings to the live image (like not starting light-locker) - * zram-config # enable zram support with an upstart job - * feh # Background support in ubiquity-dm mode - -== Other == - - * gparted - * cifs-utils # Needed by casper for CIFS root= diff --git a/live-gtk b/live-gtk index 12811ce..f952942 100644 --- a/live-gtk +++ b/live-gtk @@ -5,7 +5,7 @@ Task-Extended-Description: This task provides the extra packages installed on th Task-Relevance: 2 Task-Key: ubiquity-frontend-gtk Task-Test-new-install: skip show -Task-Seeds: live-common +Task-Seeds: live-share == Languages support == diff --git a/live-qt b/live-qt index 50c78a9..b57d843 100644 --- a/live-qt +++ b/live-qt @@ -5,7 +5,7 @@ Task-Extended-Description: This task provides the extra packages installed on th Task-Relevance: 2 Task-Key: ubiquity-frontend-qt Task-Test-new-install: skip show -Task-Seeds: live-common +Task-Seeds: live-share == Languages support == diff --git a/live-share b/live-share new file mode 100644 index 0000000..2cf75c6 --- /dev/null +++ b/live-share @@ -0,0 +1,30 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu live CD (shared packages) +Task-Extended-Description: This task provides the shared and extra packages installed on the Lubuntu live CD. It is neither useful nor recommended to install this task in other environments. +Task-Relevance: 2 +Task-Key: ubiquity-frontend +Task-Test-new-install: skip show +Task-Seeds: live-common + +== Languages support == + + * Languages: en + * language-pack-${Languages} + +== Ubiquity components == + +These packages make up the Ubiquity live installer. + + * ubiquity-slideshow-lubuntu + +== Lubuntu specifics == + + * lubuntu-live-settings # Add specific settings to the live image (like not starting light-locker) + * zram-config # enable zram support with an upstart job + * feh # Background support in ubiquity-dm mode + +== Other == + + * gparted + * cifs-utils # Needed by casper for CIFS root= diff --git a/ship-live b/ship-live index a93af49..93e9177 100644 --- a/ship-live +++ b/ship-live @@ -2,20 +2,3 @@ The ship-live seed will be added to the live CD as an ordinary package archive. Here belongs anything that somebody might need to install after installing the contents of the live CD in order to get online and fetch more packages. - -== Hardware & Network Access == - * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs - * caspar - * libatm1 # suggested by ppp for PPP-over-ATM - * setserial # needed by folks with nonstandard serial ports - * mouseemu # needed on Macs with single-button mice - * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems - * elfspe2 [powerpc] # SPE access for Cell systems - -== Installer == - - * lupin-support [amd64 i386] # installer-for-windows - * grub # needed for dmraid et al - * grub-efi [amd64] - * grub-efi-amd64-signed [amd64] - * shim-signed [amd64] diff --git a/ship-live-share b/ship-live-share new file mode 100644 index 0000000..a93af49 --- /dev/null +++ b/ship-live-share @@ -0,0 +1,21 @@ +The ship-live seed will be added to the live CD as an ordinary package +archive. Here belongs anything that somebody might need to install after +installing the contents of the live CD in order to get online and fetch more +packages. + +== Hardware & Network Access == + * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs + * caspar + * libatm1 # suggested by ppp for PPP-over-ATM + * setserial # needed by folks with nonstandard serial ports + * mouseemu # needed on Macs with single-button mice + * ps3pf-utils [powerpc] # small utilities for PlayStation 3 systems + * elfspe2 [powerpc] # SPE access for Cell systems + +== Installer == + + * lupin-support [amd64 i386] # installer-for-windows + * grub # needed for dmraid et al + * grub-efi [amd64] + * grub-efi-amd64-signed [amd64] + * shim-signed [amd64]