Update trisquel-release-upgrader to compile on latest

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

@@ -37,7 +37,7 @@ EnableApport=yes
 #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
 
 [KernelRemoval]
-Version=4.4.0
+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
@@ -48,22 +48,22 @@ Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp,
 [trisquel]
 KeyDependencies=trisquel-desktop-common-data, unity-greeter, lightdm
 # 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, resolvconf
+PostUpgradeRemove=casper, xscreensaver,  powermanagement-interface, compiz-core, gdm, gnome-ppp, remmina-common, resolvconf
-ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install, resolvconf
+ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
 
 [trisquel-mini]
 KeyDependencies=trisquel-mini-data unity-greeter
 #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
 PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager, resolvconf
-ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install, resolvconf
+ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
 
 [Files]
 BackupExt=distUpgrade
 LogDir=/var/log/dist-upgrade/
 
 [Sources]
-From=flidas
+From=etiona
-To=etiona
+To=nabia
 ValidOrigin=Trisquel
 ValidMirrors = mirrors.cfg
 Components=main

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

@@ -0,0 +1,87 @@
+[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-recommended, trisquel-mini-recommended, triskel-recommended, trisquel-sugar-recommended
+BaseMetaPkgs=trisquel-minimal, trisquel-base-recommended
+Demotions=demoted.cfg
+#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
+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=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
+#  - 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=trisquel-desktop-common-data, unity-greeter, lightdm
+# 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
+ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
+
+[trisquel-mini]
+KeyDependencies=trisquel-mini-data unity-greeter
+#Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
+PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager, resolvconf
+ForcedObsoletes= cups-pdf, notification-daemon, libcogl15, resolvconf
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=etiona
+To=nabia
+ValidOrigin=Trisquel
+ValidMirrors = mirrors.cfg
+Components=main
+Pockets=security,updates,proposed,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

@@ -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=10
+VERSION=11
 
 . ./config
 
@@ -244,13 +244,16 @@ rpl 12\.04 6\.0 DistUpgrade/*.ui
 rpl 12\.04 6\.0 po/* -R
 rpl 14\.04 7\.0 po/* -R
 rpl 14\.04 7\.0 DistUpgrade/*.ui -R
-replace '14.04' '7.0' . -R
+replace '14.04' '7.0'
 rpl 16\.04 8\.0 po/* -R
 rpl 16\.04 8\.0 DistUpgrade/*.ui -R
-replace '16.04' '8.0' . -R
+replace '16.04' '8.0'
 rpl 18\.04 9\.0 po/* -R
 rpl 18\.04 9\.0 DistUpgrade/*.ui -R
-replace '18.04' '9.0' . -R
+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
 rpl oneiric brigantia . -R
 rpl natty dagda . -R
@@ -306,8 +309,8 @@ rpl "main restricted" "main" DistUpgrade -R
 sed 's/,"restricted"//g' DistUpgrade/DistUpgradeController.py -i
 #sed 's/","restricted"/\\n"/g' DistUpgrade/DistUpgradeController.py -i
 #rpl '10.04' $REVISION DistUpgrade po -R
-replace Ubuntu Trisquel . -R
+replace Ubuntu Trisquel
-replace Canonical Trisquel . -R
+replace Canonical Trisquel
 replace "https*://www.ubuntu.com/" "https://trisquel.info" .
 replace "https*://wiki.ubuntu.com/X/Bugs/" "https://trisquel.info/project/issues" .
 replace "https*://wiki.ubuntu.com/" "https://trisquel.info/wiki" .
@@ -315,7 +318,7 @@ replace "https*://help.ubuntu.com/community" "https://trisquel.info/wiki" .
 
 
 /bin/sed -i 's/kubuntu/triskel/g; s/xubuntu/trisquel-mini/g; s/<2F>~Lubuntu/<2F>~Ltrisquel/g; s/被ubuntu/被trisquel/g; s#http://launchpad.net/ubuntu/+source/%s/%s/+changelog#https://trisquel.info/project/issues#g; s/<.*@ubuntu.com/<info@trisquel.info/g; s/ ubuntu\n/ trisquel\n/g; s/ubuntu\ /trisquel\ /g; s/\ ubuntu/\ trisquel/g; s/Ubuntu/Trisquel/g; s/ubuntu-desktop/trisquel-/g; s/www.ubuntu.com/trisquel.info/g; s/www.ubuntulinux.org/trisquel.info/g ' po/*.po $(find -type f | grep py$) $(find -type f | grep '\.glade$')
-replace Trisquel-Gettext Ubuntu-Gettext . -R
+replace Trisquel-Gettext Ubuntu-Gettext
 
 sed '1s/trisquel/ubuntu/' debian/control -i
 sed '/drivers/d' debian/control -i