CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ubuntu-release-upgrader: corrections to metapackage definitions

Browse source
This commit is contained in:
Ruben Rodriguez 2022-02-01 16:02:16 -05:00
parent 82650e287a
commit e549344b92
2 changed files with 23 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

27
helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg
View file

@ -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/

4
helpers/make-ubuntu-release-upgrader
View file

@ -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