From e993697a7bd54f5070d079f6b8e407a91994c22d Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez <ruben@trisquel.info> Date: Sun, 18 Mar 2018 20:01:52 -0400 Subject: [PATCH] Updated release-upgrader for flidas release --- .../ubuntu-release-upgrader/DistUpgrade.cfg | 42 +++++++++---------- .../DistUpgrade.cfg.belenos | 4 +- helpers/make-ubuntu-release-upgrader | 5 +-- 3 files changed, 23 insertions(+), 28 deletions(-) diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg index 0f14f637..48cc4e18 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg @@ -1,9 +1,9 @@ [View] # the views will be tried in this order, if one fails to import, the next # is tried -View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText +View=DistUpgradeViewGtk3,DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText #View=DistUpgradeViewNonInteractive -Depends= apt (>= 1.0.10.2ubuntu2) +#Depends= python-apt (>= 0.6.0), apt (>= 0.6) # the views below support upgrades over ssh connection SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive @@ -13,46 +13,42 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive MetaPkgs=trisquel-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended Demotions=demoted.cfg -#RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin +RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin RemovalBlacklistFile=removal_blacklist.cfg # if those packages were installed, make sure to keep them installed -KeepInstalledPkgs=xserver-xorg-video-all +KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all KeepInstalledSection=translations RemoveObsoletes=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 -#PostUpgradeUpgrade=brasero,edubuntu-desktop +ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools, gnome-session-flashback +# hints for for stuff that should be done early +PostUpgradePurge=ltsp-client, ltspfsd +PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, kdm, xsettings-kde +PostUpgradeUpgrade=brasero,edubuntu-desktop #PostUpgradeInstall=apt -PostInstallScripts=./xorg_fix_proprietary.py +PostInstallScripts=./trisquel-postinstall.sh EnableApport=yes # this supported blacklisting 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 +BadVersions=blcr-dkms_0.8.2-13 # ubiquity slideshow #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ [KernelRemoval] -Version=4.2.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 +Version=3.2.0 +BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm +Types=386,ec2,generic,rt,server,virtual # information about the individual meta-pkgs [trisquel] -KeyDependencies=trisquel-desktop-common-data, unity-greeter, trisquel-session +KeyDependencies=trisquel-desktop-common-data, unity-greeter # those pkgs will be marked remove right after the distUpgrade in the cache PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common -ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, gdm, notification-daemon +ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15 [trisquel-mini] KeyDependencies=trisquel-mini-data unity-greeter -PostUpgradeRemove=casper +#Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215) +PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager [Files] BackupExt=distUpgrade @@ -64,7 +60,7 @@ To=flidas ValidOrigin=Trisquel ValidMirrors = mirrors.cfg Components=main -Pockets=security,updates,proposed,backports +Pockets=security,updates,backports ;AllowThirdParty=False ;[PreRequists] diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos index e934f7ae..48cc4e18 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos @@ -40,10 +40,10 @@ Types=386,ec2,generic,rt,server,virtual # information about the individual meta-pkgs [trisquel] -KeyDependencies=trisquel-desktop-common-data, unity-greeter, trisquel-session +KeyDependencies=trisquel-desktop-common-data, unity-greeter # those pkgs will be marked remove right after the distUpgrade in the cache PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, compiz-core, gdm, gnome-ppp, gwibber, remmina-common -ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, gdm, notification-daemon +ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15 [trisquel-mini] KeyDependencies=trisquel-mini-data unity-greeter diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index 5fdee6c1..0f164924 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/helpers/make-ubuntu-release-upgrader @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2008-2017 Ruben Rodriguez <ruben@trisquel.info> +# Copyright (C) 2008-2018 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2014 Santiago Rodriguez <santi@trisquel.info> # # This program is free software; you can redistribute it and/or modify @@ -23,7 +23,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=1 +VERSION=2 . ./config @@ -202,7 +202,6 @@ cat <<EOF > data/removal_blacklist.cfg trisquel-base trisquel-minimal trisquel-desktop-common -trisquel trisquel-mini triskel trisquel-sugar -- GitLab