From 5c025f37a83782c26618d6146a130c0f5b5e6f13 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 19 Dec 2015 18:21:38 +0100 Subject: [PATCH 01/14] Sync live task with Ubuntu one, except for language support --- live | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/live b/live index 44c66ca..26bc65a 100644 --- a/live +++ b/live @@ -12,6 +12,7 @@ Task-Seeds: live-common * Languages: en * language-pack-${Languages} * language-pack-gnome-${Languages} + * firefox-locale-${Languages} == Ubiquity components == @@ -20,17 +21,13 @@ These packages make up the Ubiquity live installer. * ubiquity-frontend-gtk * ubiquity-slideshow-lubuntu -== Extra settings == +== Lubuntu specifics == * lubuntu-live-settings + * zram-config # enable zram support with an upstart job + * feh # Background support in ubiquity-dm mode == Other == - * pptp-linux - * linux-wlan-ng - * libatm1 - * setserial - * b43-fwcutter * gparted - * feh # Background support in ubiquity-dm mode - * zram-config # enable zram support with an upstart job + * cifs-utils # Needed by casper for CIFS root= From 94d3bd49128bd8a3bb3c3ff9c3b7d1baec88eaef Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 19 Dec 2015 18:22:47 +0100 Subject: [PATCH 02/14] Add some comments to live task --- live | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/live b/live index 26bc65a..3efbbc0 100644 --- a/live +++ b/live @@ -23,9 +23,9 @@ These packages make up the Ubiquity live installer. == Lubuntu specifics == - * lubuntu-live-settings - * zram-config # enable zram support with an upstart job - * feh # Background support in ubiquity-dm mode + * 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 == From aaaebbba27b8523a1d01af3828a9c9c66c354172 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Fri, 15 Jan 2016 17:03:51 +0100 Subject: [PATCH 03/14] Some sorting --- desktop | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/desktop b/desktop index b0fd9c0..12fcbd6 100644 --- a/desktop +++ b/desktop @@ -39,7 +39,6 @@ Task-Key: lubuntu-desktop * sylpheed-plugins [!powerpc] * sylpheed-doc [!powerpc] * pidgin -# * pidgin-microblog Mostly broken LP: #1190406 * transmission @@ -62,7 +61,7 @@ Task-Key: lubuntu-desktop * gucharmap [!powerpc] * guvcview -= Desktopish and/or GNOMEish tools which we do need = +== Desktopish and/or GNOMEish tools which we do need == * desktop-file-utils # map MIME types to apps * xdg-user-dirs # to add the Desktop directory @@ -79,11 +78,8 @@ Task-Key: lubuntu-desktop * light-locker * light-locker-settings * lightdm-gtk-greeter-settings - * system-config-printer-gnome - * cups-driver-gutenprint * language-selector-gnome * gdebi -# * apturl # Remove, pulling webkit2 stack * gnome-disk-utility * simple-scan [!powerpc] * gnome-keyring @@ -111,6 +107,12 @@ Task-Key: lubuntu-desktop == Artwork and Look & Feel == * dmz-cursor-theme # LP: #923344 + +== Printing == + * system-config-printer-gnome + * cups-driver-gutenprint + + == Networking == * wvdial @@ -119,7 +121,7 @@ Task-Key: lubuntu-desktop * mobile-broadband-provider-info # LP: #975139 * usb-modeswitch # LP: #979304 -= Low level system plumbery = +== Low level system plumbery == * xterm # For fake mixer support in lxpanel (LP: #957749) * pm-utils # Add to support suspend in some case. @@ -141,7 +143,11 @@ Task-Key: lubuntu-desktop * fonts-nanum # LP: #1437875 -= Other = + +== Other == * lubuntu-desktop # metapackage for everything here * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead +== Removed == +# * apturl # Remove, pulling webkit2 stack +# * pidgin-microblog Mostly broken LP: #1190406 From 074677b4958c98155ce9693345d5f24e9fea9e40 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Fri, 15 Jan 2016 17:33:06 +0100 Subject: [PATCH 04/14] Switch back to depends on standart instead of desktop-common, to be able to include recommends items of desktop-common --- STRUCTURE | 2 +- desktop | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 55 insertions(+), 2 deletions(-) diff --git a/STRUCTURE b/STRUCTURE index b5d555f..55ebbf2 100644 --- a/STRUCTURE +++ b/STRUCTURE @@ -1,6 +1,6 @@ include platform.xenial feature no-follow-recommends -core: desktop-common +core: standard desktop: core live: desktop live-common ship: boot installer desktop d-i-requirements diff --git a/desktop b/desktop index 12fcbd6..27ad15e 100644 --- a/desktop +++ b/desktop @@ -103,6 +103,8 @@ Task-Key: lubuntu-desktop == 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 @@ -111,6 +113,23 @@ Task-Key: lubuntu-desktop == Printing == * system-config-printer-gnome * 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 == Networking == @@ -120,16 +139,32 @@ Task-Key: lubuntu-desktop * 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 + +== 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 == Low level system plumbery == * xterm # For fake mixer support in lxpanel (LP: #957749) * pm-utils # Add to support suspend in some case. + * acpi-support * synaptic # for our purposes, it's plumbing ... * software-properties-gtk # Nice GUI to change reporsitory settings / extra drivers * update-notifier # For crash report and updates notifications * ubuntu-release-upgrader-gtk # For upgrade of L/Ubuntu releases. * lubuntu-software-center + * ubuntu-drivers-common # Make it harder to remove detection support, LP#704597 * fcitx * fcitx-config-gtk2 @@ -140,9 +175,27 @@ Task-Key: lubuntu-desktop * whoopsie # LP: 1001630 * fonts-droid # Extra font to display asian characters - * fonts-nanum # LP: #1437875 + * 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 + + * xorg # this includes xserver-xorg->xserver-xorg-{input|video}-* (no need to add specific drivers manually) + * !linux-image-* # xorg transitively depends on this, but this would pull in grub-pc; we handle that separately + + * xkb-data + + * memtest86+ + * anacron # generally appropriate for desktops + * kerneloops-daemon # watch for and allow reporting of kernel problems + * policykit-desktop-privileges # passwordless disk/CPU speed/time operations for admins + * libpam-systemd # logind, cross desktop compatibility +== Specific == + * apmd [armel] + * pbbuttonsd [powerpc] == Other == * lubuntu-desktop # metapackage for everything here From 36954132114242935d6d84691fa569f89b1024c9 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Mon, 29 Feb 2016 22:33:33 +0100 Subject: [PATCH 05/14] Split GTK - Qt seeds --- STRUCTURE | 16 ++++-- core | 11 ++-- core-gtk | 18 +++++++ core-qt | 17 ++++++ desktop | 143 +++++++++++--------------------------------------- desktop-gtk | 118 +++++++++++++++++++++++++++++++++++++++++ desktop-qt | 85 ++++++++++++++++++++++++++++++ langpacksize | 70 ++++++++++++++++++++++++ live | 5 +- live-gtk | 19 +++++++ live-qt | 19 +++++++ ship-live | 3 -- ship-live-gtk | 13 +++++ ship-live-qt | 9 ++++ supported | 18 ------- 15 files changed, 417 insertions(+), 147 deletions(-) create mode 100644 core-gtk create mode 100644 core-qt create mode 100644 desktop-gtk create mode 100644 desktop-qt create mode 100644 langpacksize create mode 100644 live-gtk create mode 100644 live-qt create mode 100644 ship-live-gtk create mode 100644 ship-live-qt diff --git a/STRUCTURE b/STRUCTURE index 55ebbf2..297e604 100644 --- a/STRUCTURE +++ b/STRUCTURE @@ -1,9 +1,17 @@ include platform.xenial feature no-follow-recommends -core: standard -desktop: core +core: core-gtk +core-gtk: standard +core-qt: standard +desktop: core desktop-gtk +desktop-gtk: standard +desktop-qt: standard live: desktop live-common +live-gtk: desktop-gtk live-common +live-qt: desktop-qt live-common ship: boot installer desktop d-i-requirements -ship-live: boot live +ship-live: ship-live-gtk +ship-live-gtk: boot live +ship-live-qt: boot live # make sure supported remains the last entry -supported: desktop ship-live supported-common core +supported: desktop desktop-gtk desktop-qt ship-live ship-live-gtk ship-live-qt supported-common core core-gtk core-qt diff --git a/core b/core index 354d52d..8af8235 100644 --- a/core +++ b/core @@ -7,12 +7,11 @@ Task-Seeds: desktop-common * Feature: no-follow-recommends -= LXDE core packages = - * pcmanfm - * lxpanel - * lxsession += LXDE / LXQt core packages = + * openbox + * lxsession = Lubuntu core packages = @@ -24,10 +23,8 @@ Task-Seeds: desktop-common = Other needed packages = * dbus-x11 - * lightdm - * lightdm-gtk-greeter -= Other = += 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 diff --git a/core-gtk b/core-gtk new file mode 100644 index 0000000..086baad --- /dev/null +++ b/core-gtk @@ -0,0 +1,18 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu minimal installation +Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). +Task-Key: lubuntu-core +Task-Seeds: desktop-common-gtk + + * Feature: no-follow-recommends + += LXDE core packages = + + * pcmanfm + * lxpanel + * lxsession + += Other needed packages = + * lightdm + * lightdm-gtk-greeter diff --git a/core-qt b/core-qt new file mode 100644 index 0000000..28a56fa --- /dev/null +++ b/core-qt @@ -0,0 +1,17 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu minimal installation +Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). +Task-Key: lubuntu-core +Task-Seeds: desktop-common-gtk + + * Feature: no-follow-recommends + += LXDE core packages = + + * pcmanfm-qt + * lxqt-panel + += Display manager = + * sddm + * sddm-theme-lubuntu-chooser diff --git a/desktop b/desktop index 27ad15e..e0d6489 100644 --- a/desktop +++ b/desktop @@ -5,112 +5,48 @@ Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environme Task-Key: lubuntu-desktop * Feature: no-follow-recommends - -= Lubuntu = +== Default seeds == + + * lubuntu-desktop-gtk * lubuntu-core - * lubuntu-default-session - -= Lxde = - - * lxappearance - * lxappearance-obconf - * lxinput - * lxshortcut - * gpicview - * lxterminal - * file-roller - * lxrandr - * obconf - * x11-utils - * leafpad - * lxlauncher - * lxpanel-indicator-applet-plugin - * lxsession-logout - * lxsession-default-apps - * libfm-modules -== Internet == +== LXDE / LXQt common components == - * firefox - * xul-ext-ubufox - * sylpheed [!powerpc] - * sylpheed-i18n [!powerpc] - * sylpheed-plugins [!powerpc] - * sylpheed-doc [!powerpc] - * pidgin - * transmission + * libfm-modules + +== Accessories == + * scrot == Multimedia == - * gnome-mplayer - * audacious [!powerpc] - * audacious-plugins [!powerpc] * libmtp-runtime # needed by libmtp9 (normally seeded through recommends LP: #1061430) * ffmpegthumbnailer # For videos thumbnails -== Accessories == - - * galculator - * xfburn - * mtpaint - * lxtask - * hardinfo [!powerpc] - * scrot - * gucharmap [!powerpc] - * guvcview - -== Desktopish and/or GNOMEish tools which we do need == +== Desktopish tools which we do need == * desktop-file-utils # map MIME types to apps * xdg-user-dirs # to add the Desktop directory - * xdg-user-dirs-gtk # in pcmanfm + standard directory * gvfs-fuse # for access of non gio applications to gvfs mounts * gvfs-backends # for adding support for backends (photos, network etc ...) to gvfs - - * gnome-system-tools - * gnome-time-admin # Support for time configuration. * ntp # Add support for synchronisation with time servers - - * xfce4-power-manager - * xfce4-power-manager-plugins # Support for lxpanel plugin - * light-locker - * light-locker-settings - * lightdm-gtk-greeter-settings - * language-selector-gnome - * gdebi - * gnome-disk-utility - * simple-scan [!powerpc] - * gnome-keyring - * pinentry-gtk2 # LP: #1473952 - Install the gtk2 version of pinentry, along with gnome-keyring and gpg-agent. - * blueman - * xfce4-notifyd # Replacement for notification-daemon - * libgtk2-perl # Add GTK interface for synaptic (LP: #926581) - * indicator-application-gtk2 # Add indicator icons in notification area by default, - # to workaroud bugs in fallback mode - - * usb-creator-gtk # Adding utility to make USB bootable - -== Office == - - * abiword [!powerpc] - * gnumeric [!powerpc] - * evince - * xpad [!powerpc] == 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 + * lubuntu-icon-theme + * dmz-cursor-theme # LP: #923344 == Printing == + * system-config-printer-gnome * cups-driver-gutenprint * cups # our preferred printer management infrastructure @@ -131,11 +67,19 @@ Task-Key: lubuntu-desktop * 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 - * network-manager-gnome * modemmanager # Add support for mobile modem LP: #967132 * mobile-broadband-provider-info # LP: #975139 * usb-modeswitch # LP: #979304 @@ -145,62 +89,39 @@ Task-Key: lubuntu-desktop * libnss-mdns # IPv4 link-local DNS support * ca-certificates # common SSL certificates -== 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 - == Low level system plumbery == * xterm # For fake mixer support in lxpanel (LP: #957749) * pm-utils # Add to support suspend in some case. * acpi-support - * synaptic # for our purposes, it's plumbing ... - * software-properties-gtk # Nice GUI to change reporsitory settings / extra drivers + * laptop-detect * update-notifier # For crash report and updates notifications - * ubuntu-release-upgrader-gtk # For upgrade of L/Ubuntu releases. - * lubuntu-software-center - * ubuntu-drivers-common # Make it harder to remove detection support, LP#704597 - - * fcitx - * fcitx-config-gtk2 - * fcitx-frontend-gtk2 - * fcitx-ui-classic - - * apport-gtk # support for ubuntu-bug command + * 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-droid # Extra font to display asian characters * fonts-nanum # LP: #1437875 - * (pcmciautils) # PCMCIA support for >= 2.6.13-rc1 kernels + * pcmciautils # PCMCIA support for >= 2.6.13-rc1 kernels * inputattach # needed for serial mice * libsasl2-modules # allows integration with MTA and login system - - * xorg # this includes xserver-xorg->xserver-xorg-{input|video}-* (no need to add specific drivers manually) - * !linux-image-* # xorg transitively depends on this, but this would pull in grub-pc; we handle that separately * xkb-data * memtest86+ * anacron # generally appropriate for desktops - * kerneloops-daemon # watch for and allow reporting of kernel problems - * policykit-desktop-privileges # passwordless disk/CPU speed/time operations for admins - * libpam-systemd # logind, cross desktop compatibility + + * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead == Specific == + * apmd [armel] * pbbuttonsd [powerpc] == Other == * lubuntu-desktop # metapackage for everything here - * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead - -== Removed == -# * apturl # Remove, pulling webkit2 stack -# * pidgin-microblog Mostly broken LP: #1190406 diff --git a/desktop-gtk b/desktop-gtk new file mode 100644 index 0000000..01741a2 --- /dev/null +++ b/desktop-gtk @@ -0,0 +1,118 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu Desktop (GTK part) +Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environment). +Task-Key: lubuntu-desktop-gtk + + * Feature: no-follow-recommends + += Lubuntu = + + * lubuntu-default-session + += Lxde = + + * lxappearance + * lxappearance-obconf + * lxinput + * lxshortcut + * gpicview + * lxterminal + * file-roller + * lxrandr + * obconf + * leafpad + * lxlauncher + * lxpanel-indicator-applet-plugin + * lxsession-logout + * lxsession-default-apps + +== Internet == + + * firefox + * xul-ext-ubufox + * sylpheed [!powerpc] + * sylpheed-i18n [!powerpc] + * sylpheed-plugins [!powerpc] + * sylpheed-doc [!powerpc] + * pidgin + * transmission + + +== Multimedia == + + * gnome-mplayer + * audacious [!powerpc] + * audacious-plugins [!powerpc] + +== Accessories == + + * galculator + * xfburn + * mtpaint + * lxtask + * hardinfo [!powerpc] + * gucharmap [!powerpc] + * guvcview + +== Desktopish and/or GNOMEish tools which we do need == + + * xdg-user-dirs-gtk # in pcmanfm + standard directory + + * gnome-system-tools + * gnome-time-admin # Support for time configuration. + + * xfce4-power-manager + * xfce4-power-manager-plugins # Support for lxpanel plugin + * light-locker + * light-locker-settings + * lightdm-gtk-greeter-settings + * language-selector-gnome + * gdebi + * gnome-disk-utility + * simple-scan [!powerpc] + * gnome-keyring + * pinentry-gtk2 # LP: #1473952 - Install the gtk2 version of pinentry, along with gnome-keyring and gpg-agent. + * blueman + * xfce4-notifyd # Replacement for notification-daemon + + * indicator-application-gtk2 # Add indicator icons in notification area by default, + # to workaroud bugs in fallback mode + + * usb-creator-gtk # Adding utility to make USB bootable + +== Office == + + * abiword [!powerpc] + * gnumeric [!powerpc] + * evince + * xpad [!powerpc] + + +== Networking == + + * network-manager-gnome + +== Low level system plumbery == + + * synaptic # for our purposes, it's plumbing ... + * software-properties-gtk # Nice GUI to change reporsitory settings / extra drivers + * update-notifier # For crash report and updates notifications + * ubuntu-release-upgrader-gtk # For upgrade of L/Ubuntu releases. + * lubuntu-software-center + + * fcitx + * fcitx-config-gtk2 + * fcitx-frontend-gtk2 + * fcitx-ui-classic + + * apport-gtk # support for ubuntu-bug command + + +== Other == + * lubuntu-desktop-gtk # metapackage for everything here + * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead + +== Removed == +# * apturl # Remove, pulling webkit2 stack +# * pidgin-microblog Mostly broken LP: #1190406 diff --git a/desktop-qt b/desktop-qt new file mode 100644 index 0000000..8cb051c --- /dev/null +++ b/desktop-qt @@ -0,0 +1,85 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu Qt Desktop +Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXQt environment). +Task-Key: lubuntu-desktop-qt + + * Feature: no-follow-recommends + += Lubuntu = + + * qlubuntu-default-session + + += LXQt = + + * lxqt-common + * lxqt-session + * qterminal + * lxqt-about + * lxqt-globalkeys + * lxqt-policykit + * lxqt-powermanagement + * lxqt-openssh-askpass + * lxqt-runner + * lxqt-notificationd + * lxqt-config + * lxqt-qtplugin + * lxqt-admin + * lximage-qt + * lxqt-sudo + * qps + +# Force svg support for Qt + * libqt5svg5 + + +== Internet == + + * qupzilla + * transmission-qt + +== Multimedia == + + * vlc + +== Accessories == + + * 2048-qt + * juffed + * noblenote + +== Desktopish and/or GNOMEish tools which we do need == + + * gdebi-kde + * pinentry-qt # LP: #1473952 - Install the gtk2 version of pinentry, along with gnome-keyring and gpg-agent. + * usb-creator-kde # Adding utility to make USB bootable + +== Office == + + * libreoffice-calc + * libreoffice-impress + * libreoffice-writer + * libreoffice-kde + * qpdfview + +== Low level system plumbery == + +# Packages management + * muon + * muon-discover + * muon-updater + + * software-properties-kde # Nice GUI to change reporsitory settings / extra drivers + * ubuntu-release-upgrader-qt + + * fcitx + * fcitx-frontend-qt5 + * fcitx-ui-qimpanel + +== Other == + * lubuntu-desktop-qt # metapackage for everything here + +== Removed == +# * apturl # Remove, pulling webkit2 stack +# * pidgin-microblog Mostly broken LP: #1190406 diff --git a/langpacksize b/langpacksize new file mode 100644 index 0000000..5f65891 --- /dev/null +++ b/langpacksize @@ -0,0 +1,70 @@ +#!/usr/bin/python + +import apt, re, sys + +apt_cache = apt.Cache() + +# most spoken languages of the world, prioritized +priority_langs = [ 'en', 'es', 'de', 'fr', 'ru', 'pt', 'it', 'zh-hans', 'pl', 'ja', 'nl', 'cs', 'xh', 'hu', 'zh', 'bn'] + +extra_pkgs_counted = {'gnome': set(), 'kde': set(), '(gnome|kde)': set()} + +def language_size(lang, mode): + '''Return the cumulative size of all language packs related to the given + language code.''' + + sum = 0 + name_re = re.compile('^language-pack-(?:%s-)?%s(?:-|$)' % (mode, lang)) + for p in apt_cache.keys(): + if name_re.match(p): + sum += apt_cache[p].candidate.size + + if sum == 0: + raise Exception('Invalid language: %s' % lang) + + return sum + +def all_languages(): + '''Return list of all available languages.''' + + langs = [] + for p in apt_cache.keys(): + if p.startswith('language-pack-'): + comps = p.split('-') + if len(comps) == 3 and comps[2] != 'zh': + langs.append(comps[2]) + if len(comps) == 4 and comps[2] == 'zh' and comps[3] != 'base': + langs.append('%s-%s' % (comps[2], comps[3])) + return langs + +def main(): + # prioritize languages + langs = all_languages() + langs.sort() + priority_langs.reverse() + for pl in priority_langs: + if pl in langs: + langs.remove(pl) + langs.insert(0, pl) + + gnomesum = 0 + kdesum = 0 + gnomekdesum = 0 + for l in langs: + gsize = language_size(l, 'gnome') + ksize = language_size(l, 'kde') + gksize = language_size(l, '(gnome|kde)') + gnomesum += gsize + kdesum += ksize + gnomekdesum += gksize + + if len(sys.argv) > 1 and sys.argv[1] == 'MB': + print("%-5s G: %8.2f K: %8.2f G+K: %8.2f GSum: %8.2f KSum: %8.2f G+KSum: %8.2f" % \ + (l, gsize/1048576., ksize/1048576., gksize/1048576., + gnomesum/1048576., kdesum/1048576., gnomekdesum/1048576.)) + else: + print("%-5s G: %10i K: %10i G+K: %10i GSum: %10i KSum: %10i G+KSum: %10i" % \ + (l, gsize, ksize, gksize, gnomesum, kdesum, gnomekdesum)) + +if __name__ == '__main__': + main() diff --git a/live b/live index 3efbbc0..501b3b7 100644 --- a/live +++ b/live @@ -3,7 +3,7 @@ Task-Section: user Task-Description: Lubuntu live CD Task-Extended-Description: This task provides the 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-gtk +Task-Key: ubiquity-frontend Task-Test-new-install: skip show Task-Seeds: live-common @@ -11,14 +11,11 @@ Task-Seeds: live-common * Languages: en * language-pack-${Languages} - * language-pack-gnome-${Languages} - * firefox-locale-${Languages} == Ubiquity components == These packages make up the Ubiquity live installer. - * ubiquity-frontend-gtk * ubiquity-slideshow-lubuntu == Lubuntu specifics == diff --git a/live-gtk b/live-gtk new file mode 100644 index 0000000..8e67fe0 --- /dev/null +++ b/live-gtk @@ -0,0 +1,19 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu live CD +Task-Extended-Description: This task provides the 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-gtk +Task-Test-new-install: skip show +Task-Seeds: live-common + +== Languages support == + + * language-pack-gnome-${Languages} + * firefox-locale-${Languages} + +== Ubiquity components == + +These packages make up the Ubiquity live installer. + + * ubiquity-frontend-gtk diff --git a/live-qt b/live-qt new file mode 100644 index 0000000..7b65c67 --- /dev/null +++ b/live-qt @@ -0,0 +1,19 @@ +Task-Per-Derivative: 1 +Task-Section: user +Task-Description: Lubuntu live CD +Task-Extended-Description: This task provides the 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-qt +Task-Test-new-install: skip show +Task-Seeds: live-common + +== Languages support == + + * Languages: en + * language-pack-kde-${Languages} + +== Ubiquity components == + +These packages make up the Ubiquity live installer. + + * ubiquity-frontend-kde diff --git a/ship-live b/ship-live index 098803d..3355bab 100644 --- a/ship-live +++ b/ship-live @@ -11,7 +11,6 @@ These packages are needed in order to build Ubuntu packages. * fakeroot == Hardware & Network Access == - * network-manager-gnome * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs * sl-modem-daemon # needed for some Winmodems (see OutoftheboxWinmodem) * eagle-usb-utils # needed for some ADSL modems @@ -36,5 +35,3 @@ These packages are needed in order to build Ubuntu packages. * grub-efi [amd64] * grub-efi-amd64-signed [amd64] * shim-signed [amd64] - * oem-config-gtk - * ubiquity-frontend-gtk diff --git a/ship-live-gtk b/ship-live-gtk new file mode 100644 index 0000000..b7ffc63 --- /dev/null +++ b/ship-live-gtk @@ -0,0 +1,13 @@ +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 == + + * network-manager-gnome + +== Installer == + + * oem-config-gtk + * ubiquity-frontend-gtk diff --git a/ship-live-qt b/ship-live-qt new file mode 100644 index 0000000..a8d7d97 --- /dev/null +++ b/ship-live-qt @@ -0,0 +1,9 @@ +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. + +== Installer == + + * oem-config-kde + * ubiquity-frontend-kde diff --git a/supported b/supported index cb7f2ad..59a633e 100644 --- a/supported +++ b/supported @@ -45,21 +45,3 @@ included due to matching Extra-Include patterns, and has no other effect): Transitional packages: * Extra-Exclude: xserver-xorg-video-amd-dbg - -Exclude some KDE-specific pieces: - - * Extra-Exclude: kdebase-dbg - * Extra-Exclude: kdelibs-dbg - * Extra-Exclude: kdelibs4-doc - * Extra-Exclude: kdepim-dbg - * Extra-Exclude: kdesdk-dbg - * Extra-Exclude: libdbus-qt-1-dev - * Extra-Exclude: libdcop3-java-dev - * Extra-Exclude: libindex0-dev - * Extra-Exclude: libpoppler-qt-dev - * Extra-Exclude: libqt4-debug libqt4-debug-dev qt4-doc - * Extra-Exclude: libsmokekde-dev - * Extra-Exclude: python-kde3-dbg - * Extra-Exclude: python-qt3-dbg - * Extra-Exclude: python-qtext-dbg - * Extra-Exclude: qt-x11-free-dbg From 43bfa85af062ab65b956fdf1be3198c7bfe0f728 Mon Sep 17 00:00:00 2001 From: Gunnar Hjalmarsson Date: Sat, 5 Mar 2016 02:19:41 +0100 Subject: [PATCH 06/14] fonts-noto-cjk for Chinese instead of fonts-droid (LP: #1468027) --- desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/desktop b/desktop index e0d6489..c63bbee 100644 --- a/desktop +++ b/desktop @@ -103,7 +103,7 @@ Task-Key: lubuntu-desktop * whoopsie # LP: 1001630 * kerneloops-daemon # watch for and allow reporting of kernel problems - * fonts-droid # Extra font to display asian characters + * fonts-noto-cjk # Extra font to display asian characters * fonts-nanum # LP: #1437875 * pcmciautils # PCMCIA support for >= 2.6.13-rc1 kernels From b8297a52b201939c85c8ce213d88b59eed0c1785 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Sat, 9 Apr 2016 10:36:47 +0200 Subject: [PATCH 07/14] Update split gtk - qt --- core | 2 +- core-gtk | 3 ++- core-qt | 5 ++++- desktop | 13 ++++--------- desktop-gtk | 10 +++++++--- desktop-qt | 35 +++++++++++++++++++++++------------ live-gtk | 1 + 7 files changed, 42 insertions(+), 27 deletions(-) diff --git a/core b/core index 8af8235..3327166 100644 --- a/core +++ b/core @@ -11,12 +11,12 @@ Task-Seeds: desktop-common = LXDE / LXQt core packages = * openbox - * lxsession = Lubuntu core packages = * lubuntu-default-settings * lubuntu-artwork + * lubuntu-icon-theme * plymouth-theme-lubuntu-logo * plymouth-theme-lubuntu-text diff --git a/core-gtk b/core-gtk index 086baad..54533a8 100644 --- a/core-gtk +++ b/core-gtk @@ -3,7 +3,7 @@ Task-Section: user Task-Description: Lubuntu minimal installation Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-core -Task-Seeds: desktop-common-gtk +Task-Seeds: desktop-common * Feature: no-follow-recommends @@ -12,6 +12,7 @@ Task-Seeds: desktop-common-gtk * pcmanfm * lxpanel * lxsession + * lxterminal = Other needed packages = * lightdm diff --git a/core-qt b/core-qt index 28a56fa..1293337 100644 --- a/core-qt +++ b/core-qt @@ -3,7 +3,7 @@ Task-Section: user Task-Description: Lubuntu minimal installation Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-core -Task-Seeds: desktop-common-gtk +Task-Seeds: desktop-common * Feature: no-follow-recommends @@ -11,6 +11,9 @@ Task-Seeds: desktop-common-gtk * pcmanfm-qt * lxqt-panel + * lxqt-common + * lxqt-session + * qterminal = Display manager = * sddm diff --git a/desktop b/desktop index c63bbee..9d26b48 100644 --- a/desktop +++ b/desktop @@ -15,10 +15,6 @@ Task-Key: lubuntu-desktop * libfm-modules -== Accessories == - - * scrot - == Multimedia == * libmtp-runtime # needed by libmtp9 (normally seeded through recommends LP: #1061430) @@ -31,7 +27,7 @@ Task-Key: lubuntu-desktop * 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 - * libgtk2-perl # Add GTK interface for synaptic (LP: #926581) + * compton == Archive support == @@ -42,12 +38,10 @@ Task-Key: lubuntu-desktop == Artwork and Look & Feel == - * lubuntu-icon-theme * dmz-cursor-theme # LP: #923344 == Printing == - * system-config-printer-gnome * cups-driver-gutenprint * cups # our preferred printer management infrastructure * cups-bsd # gives us lpc, lpq, lpr, lprm @@ -91,7 +85,6 @@ Task-Key: lubuntu-desktop == Low level system plumbery == - * xterm # For fake mixer support in lxpanel (LP: #957749) * pm-utils # Add to support suspend in some case. * acpi-support * laptop-detect @@ -106,9 +99,11 @@ Task-Key: lubuntu-desktop * fonts-noto-cjk # Extra font to display asian characters * fonts-nanum # LP: #1437875 - * pcmciautils # PCMCIA support for >= 2.6.13-rc1 kernels + * 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 diff --git a/desktop-gtk b/desktop-gtk index 01741a2..85feae9 100644 --- a/desktop-gtk +++ b/desktop-gtk @@ -17,7 +17,6 @@ Task-Key: lubuntu-desktop-gtk * lxinput * lxshortcut * gpicview - * lxterminal * file-roller * lxrandr * obconf @@ -54,11 +53,14 @@ Task-Key: lubuntu-desktop-gtk * hardinfo [!powerpc] * gucharmap [!powerpc] * guvcview + * scrot == Desktopish and/or GNOMEish tools which we do need == * xdg-user-dirs-gtk # in pcmanfm + standard directory + * libgtk2-perl # Add GTK interface for synaptic (LP: #926581) + * gnome-system-tools * gnome-time-admin # Support for time configuration. @@ -93,6 +95,10 @@ Task-Key: lubuntu-desktop-gtk * network-manager-gnome +== Printing == + + * system-config-printer-gnome + == Low level system plumbery == * synaptic # for our purposes, it's plumbing ... @@ -101,7 +107,6 @@ Task-Key: lubuntu-desktop-gtk * ubuntu-release-upgrader-gtk # For upgrade of L/Ubuntu releases. * lubuntu-software-center - * fcitx * fcitx-config-gtk2 * fcitx-frontend-gtk2 * fcitx-ui-classic @@ -111,7 +116,6 @@ Task-Key: lubuntu-desktop-gtk == Other == * lubuntu-desktop-gtk # metapackage for everything here - * python3-aptdaemon.pkcompat # preferred packagekit-system-interface alternative so that we don't end up with packagekit instead == Removed == # * apturl # Remove, pulling webkit2 stack diff --git a/desktop-qt b/desktop-qt index 8cb051c..c723a4c 100644 --- a/desktop-qt +++ b/desktop-qt @@ -13,20 +13,16 @@ Task-Key: lubuntu-desktop-qt = LXQt = - * lxqt-common - * lxqt-session - * qterminal * lxqt-about + * lxqt-admin + * lxqt-config * lxqt-globalkeys + * lxqt-notificationd + * lxqt-openssh-askpass * lxqt-policykit * lxqt-powermanagement - * lxqt-openssh-askpass * lxqt-runner - * lxqt-notificationd - * lxqt-config * lxqt-qtplugin - * lxqt-admin - * lximage-qt * lxqt-sudo * qps @@ -38,22 +34,39 @@ Task-Key: lubuntu-desktop-qt * qupzilla * transmission-qt + * quassel + +== Network == + + * cmst == Multimedia == - * vlc + * smplayer + * smplayer-l10n + * smplayer-themes + * smtube + * calibre == Accessories == * 2048-qt * juffed * noblenote + * xarchiver + * screengrap + * nomacs # Edit image capability, instead of lximage-qt -== Desktopish and/or GNOMEish tools which we do need == +== Desktopish tools which we do need == + * xscreensaver * gdebi-kde * pinentry-qt # LP: #1473952 - Install the gtk2 version of pinentry, along with gnome-keyring and gpg-agent. * usb-creator-kde # Adding utility to make USB bootable + * compton-conf + * obconf-qt + * qlipper + * qtpass == Office == @@ -73,7 +86,6 @@ Task-Key: lubuntu-desktop-qt * software-properties-kde # Nice GUI to change reporsitory settings / extra drivers * ubuntu-release-upgrader-qt - * fcitx * fcitx-frontend-qt5 * fcitx-ui-qimpanel @@ -82,4 +94,3 @@ Task-Key: lubuntu-desktop-qt == Removed == # * apturl # Remove, pulling webkit2 stack -# * pidgin-microblog Mostly broken LP: #1190406 diff --git a/live-gtk b/live-gtk index 8e67fe0..323c182 100644 --- a/live-gtk +++ b/live-gtk @@ -9,6 +9,7 @@ Task-Seeds: live-common == Languages support == + * Languages: en * language-pack-gnome-${Languages} * firefox-locale-${Languages} From 960fb7c93245cf4182f49f82ef3d8b6570cc7f21 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 12 May 2016 22:59:12 +0200 Subject: [PATCH 08/14] Cleaning spaces --- desktop-qt | 5 ++--- live | 2 +- ship | 14 +++++++------- ship-live | 16 ++++++++-------- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/desktop-qt b/desktop-qt index c723a4c..0882cf8 100644 --- a/desktop-qt +++ b/desktop-qt @@ -26,8 +26,7 @@ Task-Key: lubuntu-desktop-qt * lxqt-sudo * qps -# Force svg support for Qt - * libqt5svg5 + * libqt5svg5 # Force svg support for Qt == Internet == @@ -90,7 +89,7 @@ Task-Key: lubuntu-desktop-qt * fcitx-ui-qimpanel == Other == - * lubuntu-desktop-qt # metapackage for everything here + * lubuntu-desktop-qt # metapackage for everything here == Removed == # * apturl # Remove, pulling webkit2 stack diff --git a/live b/live index 501b3b7..54c1580 100644 --- a/live +++ b/live @@ -27,4 +27,4 @@ These packages make up the Ubiquity live installer. == Other == * gparted - * cifs-utils # Needed by casper for CIFS root= + * cifs-utils # Needed by casper for CIFS root= diff --git a/ship b/ship index da4d78f..f8e29a0 100644 --- a/ship +++ b/ship @@ -1,28 +1,28 @@ == Kernel == - * linux [amd64] # not i386 because top-level 'linux' is -generic-pae now + * linux [amd64] # not i386 because top-level 'linux' is -generic-pae now == Server == * ssh - * nfs-kernel-server # need an NFS server + * nfs-kernel-server # need an NFS server == Networking == * bsd-mailx - * vlan # userland tools to config 8021q support + * vlan # userland tools to config 8021q support == Common UNIX stuff == - * nfs-common # allows people to access NFS filesystems + * nfs-common # allows people to access NFS filesystems # * vim # vim-tiny is in minimal; vim includes syntax highlighting, help files, etc. == Hardware & Network Access == - * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs + * pptp-linux # client for Microsoft-compatible VPN's, needed for some ISPs - * libatm1 # suggested by ppp for PPP-over-ATM - * setserial # needed by folks with nonstandard serial ports + * libatm1 # suggested by ppp for PPP-over-ATM + * setserial # needed by folks with nonstandard serial ports * b43-fwcutter == Common language packs == diff --git a/ship-live b/ship-live index 10b6e7b..a93af49 100644 --- a/ship-live +++ b/ship-live @@ -4,18 +4,18 @@ 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 + * 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 + * 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 + * lupin-support [amd64 i386] # installer-for-windows + * grub # needed for dmraid et al * grub-efi [amd64] * grub-efi-amd64-signed [amd64] * shim-signed [amd64] From 2d842fdc4f04858112b5aff9edc6fb020ad11c20 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 12 May 2016 23:19:18 +0200 Subject: [PATCH 09/14] couple of fixes for the seeds structure --- STRUCTURE | 4 ++-- core-gtk | 3 +-- core-qt | 3 +-- desktop | 1 + desktop-gtk | 1 + desktop-qt | 1 + 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/STRUCTURE b/STRUCTURE index f8885fa..2590e00 100644 --- a/STRUCTURE +++ b/STRUCTURE @@ -4,8 +4,8 @@ core: core-gtk core-gtk: standard core-qt: standard desktop: core desktop-gtk -desktop-gtk: standard -desktop-qt: standard +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 diff --git a/core-gtk b/core-gtk index 54533a8..4601f60 100644 --- a/core-gtk +++ b/core-gtk @@ -2,8 +2,7 @@ Task-Per-Derivative: 1 Task-Section: user Task-Description: Lubuntu minimal installation Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). -Task-Key: lubuntu-core -Task-Seeds: desktop-common +Task-Key: lubuntu-core-gtk * Feature: no-follow-recommends diff --git a/core-qt b/core-qt index 1293337..e6161ab 100644 --- a/core-qt +++ b/core-qt @@ -2,8 +2,7 @@ Task-Per-Derivative: 1 Task-Section: user Task-Description: Lubuntu minimal installation Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). -Task-Key: lubuntu-core -Task-Seeds: desktop-common +Task-Key: lubuntu-core-qt * Feature: no-follow-recommends diff --git a/desktop b/desktop index 9d26b48..9d60eab 100644 --- a/desktop +++ b/desktop @@ -3,6 +3,7 @@ Task-Section: user Task-Description: Lubuntu Desktop Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-desktop +Task-Seeds: desktop-gtk * Feature: no-follow-recommends diff --git a/desktop-gtk b/desktop-gtk index 4af70e1..e8ae2c3 100644 --- a/desktop-gtk +++ b/desktop-gtk @@ -3,6 +3,7 @@ Task-Section: user Task-Description: Lubuntu Desktop (GTK part) Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-desktop-gtk +Task-Seeds: core-gtk * Feature: no-follow-recommends diff --git a/desktop-qt b/desktop-qt index 0882cf8..67a7589 100644 --- a/desktop-qt +++ b/desktop-qt @@ -3,6 +3,7 @@ Task-Section: user Task-Description: Lubuntu Qt Desktop Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXQt environment). Task-Key: lubuntu-desktop-qt +Task-Seeds: core-qt * Feature: no-follow-recommends From 94932d573bc513308600aa58973242d5bb2b94f2 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 12 May 2016 23:21:19 +0200 Subject: [PATCH 10/14] Another structure fix --- core | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core b/core index 3327166..1c18ad5 100644 --- a/core +++ b/core @@ -3,7 +3,7 @@ Task-Section: user Task-Description: Lubuntu minimal installation Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-core -Task-Seeds: desktop-common +Task-Seeds: core-gtk * Feature: no-follow-recommends From 81ed49504539376df0526a203d3b496878d4a510 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Thu, 12 May 2016 23:21:55 +0200 Subject: [PATCH 11/14] Add back Intel drivers for old hardware --- core | 1 + 1 file changed, 1 insertion(+) diff --git a/core b/core index 1c18ad5..dca6d3a 100644 --- a/core +++ b/core @@ -28,3 +28,4 @@ Task-Seeds: core-gtk * 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 From e8ba75b976c5476bf83c60761dddcf7968dcc3c9 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Fri, 13 May 2016 19:29:12 +0200 Subject: [PATCH 12/14] Move audiacious to desktop, it will be used for both Qt and Gtk --- desktop | 2 ++ desktop-gtk | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop b/desktop index 9d60eab..789eb9b 100644 --- a/desktop +++ b/desktop @@ -18,6 +18,8 @@ Task-Seeds: desktop-gtk == Multimedia == + * audacious [!powerpc] + * audacious-plugins [!powerpc] * libmtp-runtime # needed by libmtp9 (normally seeded through recommends LP: #1061430) * ffmpegthumbnailer # For videos thumbnails diff --git a/desktop-gtk b/desktop-gtk index e8ae2c3..0a2216e 100644 --- a/desktop-gtk +++ b/desktop-gtk @@ -42,8 +42,6 @@ Task-Seeds: core-gtk == Multimedia == * gnome-mplayer - * audacious [!powerpc] - * audacious-plugins [!powerpc] == Accessories == From afe81ca743454c232e07836d697280c296ec354d Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Mon, 16 May 2016 09:35:13 +0200 Subject: [PATCH 13/14] Rename lubuntu-desktop-qt ==> lubuntu-qt-desktop --- desktop-qt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/desktop-qt b/desktop-qt index 67a7589..e6fc50b 100644 --- a/desktop-qt +++ b/desktop-qt @@ -2,7 +2,7 @@ Task-Per-Derivative: 1 Task-Section: user Task-Description: Lubuntu Qt Desktop Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXQt environment). -Task-Key: lubuntu-desktop-qt +Task-Key: lubuntu-qt-desktop Task-Seeds: core-qt * Feature: no-follow-recommends @@ -90,7 +90,7 @@ Task-Seeds: core-qt * fcitx-ui-qimpanel == Other == - * lubuntu-desktop-qt # metapackage for everything here + * lubuntu-qt-desktop # metapackage for everything here == Removed == # * apturl # Remove, pulling webkit2 stack From 6f1440fcdc030acbcde6e5571c1cde0224c6da18 Mon Sep 17 00:00:00 2001 From: Julien Lavergne Date: Mon, 16 May 2016 13:45:26 +0200 Subject: [PATCH 14/14] Update Task entries for all seeds --- core | 2 ++ core-gtk | 6 ++++-- core-qt | 8 +++++--- desktop | 2 ++ desktop-gtk | 4 +++- desktop-qt | 4 +++- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/core b/core index dca6d3a..b4d7e86 100644 --- a/core +++ b/core @@ -3,6 +3,8 @@ Task-Section: user Task-Description: Lubuntu minimal installation Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-core +Task-Name: lubuntu-core +Task-Metapackage: lubuntu-core Task-Seeds: core-gtk * Feature: no-follow-recommends diff --git a/core-gtk b/core-gtk index 4601f60..5ee37c0 100644 --- a/core-gtk +++ b/core-gtk @@ -1,8 +1,10 @@ Task-Per-Derivative: 1 Task-Section: user -Task-Description: Lubuntu minimal installation +Task-Description: Lubuntu minimal installation (GTK part) Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). -Task-Key: lubuntu-core-gtk +Task-Key: lubuntu-gtk-core +Task-Name: lubuntu-gtk-core +Task-Metapackage: lubuntu-gtk-core * Feature: no-follow-recommends diff --git a/core-qt b/core-qt index e6161ab..70a4392 100644 --- a/core-qt +++ b/core-qt @@ -1,8 +1,10 @@ Task-Per-Derivative: 1 Task-Section: user -Task-Description: Lubuntu minimal installation -Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXDE environment). -Task-Key: lubuntu-core-qt +Task-Description: Lubuntu minimal installation (Qt part) +Task-Extended-Description: This task provides minimal packages for Lubuntu (Ubuntu LXQt environment). +Task-Key: lubuntu-qt-core +Task-Name: lubuntu-qt-core +Task-Metapackage: lubuntu-qt-core * Feature: no-follow-recommends diff --git a/desktop b/desktop index 789eb9b..c60f026 100644 --- a/desktop +++ b/desktop @@ -3,6 +3,8 @@ Task-Section: user Task-Description: Lubuntu Desktop Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environment). Task-Key: lubuntu-desktop +Task-Name: lubuntu-desktop +Task-Metapackage: lubuntu-desktop Task-Seeds: desktop-gtk * Feature: no-follow-recommends diff --git a/desktop-gtk b/desktop-gtk index 0a2216e..c36a498 100644 --- a/desktop-gtk +++ b/desktop-gtk @@ -2,7 +2,9 @@ Task-Per-Derivative: 1 Task-Section: user Task-Description: Lubuntu Desktop (GTK part) Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXDE environment). -Task-Key: lubuntu-desktop-gtk +Task-Key: lubuntu-gtk-desktop +Task-Name: lubuntu-gtk-desktop +Task-Metapackage: lubuntu-gtk-desktop Task-Seeds: core-gtk * Feature: no-follow-recommends diff --git a/desktop-qt b/desktop-qt index e6fc50b..2e1516c 100644 --- a/desktop-qt +++ b/desktop-qt @@ -1,8 +1,10 @@ Task-Per-Derivative: 1 Task-Section: user -Task-Description: Lubuntu Qt Desktop +Task-Description: Lubuntu Qt Desktop (Qt part) Task-Extended-Description: This task provides the Lubuntu (Ubuntu LXQt environment). Task-Key: lubuntu-qt-desktop +Task-Name: lubuntu-qt-desktop +Task-Metapackage: lubuntu-qt-desktop Task-Seeds: core-qt * Feature: no-follow-recommends