diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg index 8270a3834b6f22cf8163a0b294a52cfce5eba368..d105ba893206ac6114478e323796c5195f2629be 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg @@ -10,8 +10,8 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive # Distro contains global information about the upgrade [Distro] # the meta-pkgs we support -MetaPkgs=trisquel-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended -BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended +MetaPkgs=trisquel, trisquel-mini, triskel, trisquel-sugar +BaseMetaPkgs=trisquel-minimal, trisquel-base Demotions=demoted.cfg #RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin RemovalBlacklistFile=removal_blacklist.cfg @@ -46,17 +46,32 @@ Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp, # information about the individual meta-pkgs [trisquel] -KeyDependencies=trisquel-desktop-common-data, unity-greeter, lightdm +KeyDependencies=mate-desktop-environment # those pkgs will be marked remove right after the distUpgrade in the cache -PostUpgradeRemove=casper, xscreensaver, powermanagement-interface, compiz-core, gdm, gnome-ppp, remmina-common, resolvconf +PostUpgradeRemove=casper, xscreensaver, powermanagement-interface, compiz-core, gdm, gnome-ppp, resolvconf ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf [trisquel-mini] -KeyDependencies=trisquel-mini-data unity-greeter +KeyDependencies=lxde #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215) -PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager, resolvconf +PostUpgradeRemove=casper, gnome-bluetooth, resolvconf ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf +[triskel] +KeyDependencies=triskel-settings-desktop, plasma-desktop, sddm +# those pkgs will be marked remove right after the distUpgrade in the cache +PostUpgradeRemove=casper, powermanagement-interface, guidance-power-manager, kde-guidance-powermanager, kmix +# those packages are marked as obsolete right after the upgrade +ForcedObsoletes=ivman, gtk-qt-engine +# help the resolver a bit: LP: #1426132 +PostUpgradeInstall=baloo-kf5 + +[trisquel-sugar] +KeyDependencies=sugar, lightdm-gtk-greeter + +[trisquel-gnome] +KeyDependencies=gnome-core, gdm3 + [Files] BackupExt=distUpgrade LogDir=/var/log/dist-upgrade/ diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index fd643d8f278cafe1692874d78db689b249152189..0b5254bf59d5737cdc8a34a3005d1f8a132d40df 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2020 Ruben Rodriguez <ruben@trisquel.info> +# Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info> # Copyright (C) 2019 Mason Hock <mason@masonhock.com> # @@ -24,7 +24,7 @@ # Also, don't forget to update the meta-release files at archive and packages.t.i # The "obsoletes" list from ubuntu has been removed -VERSION=11 +VERSION=12 . ./config