ubuntu-release-upgrader: add aramo release details

helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg

@@ -10,11 +10,11 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
 # Distro contains global information about the upgrade
 [Distro]
 # the meta-pkgs we support
-MetaPkgs=trisquel, trisquel-mini, triskel, trisquel-sugar
+MetaPkgs=trisquel, trisquel-mini, triskel, trisquel-sugar, trisquel-gnome
 BaseMetaPkgs=trisquel-minimal, trisquel-base
+IgnoredTasks=minimal, standard
 Demotions=demoted.cfg
-#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
-RemovalBlacklistFile=removal_blacklist.cfg
+RemovalDenylistFile=removal_denylist.cfg
 # if those packages were installed, make sure to keep them installed
 KeepInstalledPkgs=xserver-xorg-video-all
 KeepInstalledSection=translations
@@ -25,28 +25,20 @@ PurgeObsoletes=yes
 # the dist-upgrade (not to be confused with the PostUpgrade hooks in the
 # quirks handling)
 #PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
 PostUpgradeRemove=resolvconf,notification-daemon
 #PostUpgradeUpgrade=brasero,edubuntu-desktop
 #PostUpgradeInstall=apt
 #PostInstallScripts=./trisquel-postinstall.sh
-EnableApport=yes
-# this supported blacklisting certain versions to ensure we do not upgrade
+EnableApport=no
+# this supported deny listing certain versions to ensure we do not upgrade
 #  - blcr-dkms fails to build on kernel 2.6.35
 #BadVersions=blcr-dkms_0.8.2-13
 # ubiquity slideshow
 #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
 
-[KernelRemoval]
-Version=4.15.0
-BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
-  linux-header-lbm,linux-signed-image,linux-tools,linux-cloud-tools,
-  linux-image-extra
-Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp,
-  powerpc64-emb,powerpc64-smp,rt,server,virtual
-
-# information about the individual meta-pkgs
 [trisquel]
-KeyDependencies=mate-desktop-environment
+KeyDependencies=lightdm, mate-desktop-environment, marco, ubuntu-mate-default-settings, lightdm-gtk-greeter
 # those pkgs will be marked remove right after the distUpgrade in the cache
 PostUpgradeRemove=casper, xscreensaver, powermanagement-interface, compiz-core, gdm, gnome-ppp, resolvconf
 ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
@@ -59,8 +51,7 @@ 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
+PostUpgradeRemove=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
@@ -77,12 +68,12 @@ BackupExt=distUpgrade
 LogDir=/var/log/dist-upgrade/
 
 [Sources]
-From=etiona
-To=nabia
+From=nabia
+To=aramo
 ValidOrigin=Trisquel
 ValidMirrors = mirrors.cfg
 Components=main
-Pockets=security,updates,proposed,backports
+Pockets=security,updates,backports
 ;AllowThirdParty=False
 
 ;[PreRequists]

helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.nabia

+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= apt (>= 1.0.10.2ubuntu2)
+# the views below support upgrades over ssh connection
+SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
+
+# Distro contains global information about the upgrade
+[Distro]
+# the meta-pkgs we support
+MetaPkgs=trisquel, trisquel-mini, triskel, trisquel-sugar, trisquel-gnome
+BaseMetaPkgs=trisquel-minimal, trisquel-base
+IgnoredTasks=minimal, standard
+Demotions=demoted.cfg
+RemovalDenylistFile=removal_denylist.cfg
+# if those packages were installed, make sure to keep them installed
+KeepInstalledPkgs=xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+PurgeObsoletes=yes
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
+# hints for for stuff that should be done right after the cache calculated
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
+# quirks handling)
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+PostUpgradeRemove=resolvconf,notification-daemon
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradeInstall=apt
+#PostInstallScripts=./trisquel-postinstall.sh
+EnableApport=no
+# this supported deny listing certain versions to ensure we do not upgrade
+#  - blcr-dkms fails to build on kernel 2.6.35
+#BadVersions=blcr-dkms_0.8.2-13
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+[trisquel]
+KeyDependencies=lightdm, mate-desktop-environment, marco, ubuntu-mate-default-settings, lightdm-gtk-greeter
+# those pkgs will be marked remove right after the distUpgrade in the cache
+PostUpgradeRemove=casper, xscreensaver, powermanagement-interface, compiz-core, gdm, gnome-ppp, resolvconf
+ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
+
+[trisquel-mini]
+KeyDependencies=lxde
+#Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
+PostUpgradeRemove=casper, gnome-bluetooth, resolvconf
+ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
+
+[triskel]
+KeyDependencies=triskel-settings-desktop, plasma-desktop, sddm
+PostUpgradeRemove=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/
+
+[Sources]
+From=nabia
+To=aramo
+ValidOrigin=Trisquel
+ValidMirrors = mirrors.cfg
+Components=main
+Pockets=security,updates,backports
+;AllowThirdParty=False
+
+;[PreRequists]
+;Packages=release-upgrader-apt,release-upgrader-dpkg
+;SourcesList=prerequists-sources.list
+;SourcesList-ia64=prerequists-sources.ports.list
+;SourcesList-hppa=prerequists-sources.ports.list
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400

helpers/make-ubuntu-release-upgrader

 #!/bin/sh
 #
-#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2023  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=13
+VERSION=14
 
 . ./config
 
@@ -200,7 +200,7 @@ perl $DATA/parsewiki DistUpgrade/ReleaseAnnouncement > DistUpgrade/ReleaseAnnoun
 perl $DATA/parsewiki DistUpgrade/DevelReleaseAnnouncement > DistUpgrade/DevelReleaseAnnouncement.html
 
 cat <<EOF > data/removal_denylist.cfg
-# blacklist of packages that should never be removed
+# list of packages that should never be removed
 trisquel-base
 trisquel-minimal
 trisquel-desktop-common
@@ -224,6 +224,8 @@ EOF
 rm data/mirrors.cfg
 #https://mirmon.trisquel.org/conf.txt
 cat << EOF > data/mirrors.cfg
+https://archive.trisquel.info/trisquel/
+https://archive.trisquel.org/trisquel/
 https://mirror.fsf.org/trisquel/
 https://mirror.cedia.org.ec/trisquel.packages/
 https://mirrors.ustc.edu.cn/trisquel/
@@ -239,11 +241,11 @@ https://mirrors.nju.edu.cn/trisquel/
 https://mirror.math.princeton.edu/pub/trisquel-packages/
 https://mirror.operationtulip.com/trisquel/packages/
 https://mirrors.dotsrc.org/trisquel/
-https://linkwithlinux.pw/trisquel-packages/
 EOF
 
 replace changelogs.ubuntu.com packages.trisquel.org .
 
+rpl ubuntu-archive-keyring.gpg trisquel-archive-keyring.gpg . -R
 rpl 11\.04 5\.0 DistUpgrade/*.ui
 rpl 11\.04 5\.0 po/* -R
 rpl 11\.10 5\.5 DistUpgrade/*.ui
@@ -262,7 +264,7 @@ replace '18.04' '9.0'
 rpl 20\.04 10\.0 po/* -R
 rpl 20\.04 10\.0 DistUpgrade/*.ui -R
 replace '20.04' '10.0'
-rpl $UPSTREAM $CODENAME . -R
+replace '22.04' '11.0'
 rpl oneiric brigantia . -R
 rpl natty dagda . -R
 rpl maverick slaine . -R
@@ -276,6 +278,7 @@ rpl trusty belenos . -R
 rpl xenial flidas . -R
 rpl bionic etiona . -R
 rpl focal nabia . -R
+rpl jammy aramo . -R
 
 rm data/DistUpgrade.cfg*
 cp $DATA/DistUpgrade.cfg* data/
@@ -296,7 +299,8 @@ mv kubuntu-devel-release-upgrade triskel-devel-release-upgrade
 #mv tests/test-data-cdrom/ubuntu tests/test-data-cdrom/trisquel
 replace old-releases.ubuntu.com oldarchive.trisquel.org
 
-rpl "edubuntu" "trisquel-edu" . -R
+rpl "edubuntu" "trisquel-sugar" . -R
+rpl "xubuntu" "trisquel-mini" . -R
 rpl "kubuntu" "triskel" . -R
 rpl "Kubuntu" "Triskel" . -R
 rpl " Ubuntu " " Trisquel " . -R