release-upgrader updated for flidas

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,DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
+View=DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
 #View=DistUpgradeViewNonInteractive
-#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
+Depends= apt (>= 1.0.10.2ubuntu2)
 # the views below support upgrades over ssh connection
 SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
 
@@ -13,30 +13,35 @@ 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=gnumeric, hpijs, xserver-xorg-video-all
+KeepInstalledPkgs=xserver-xorg-video-all
 KeepInstalledSection=translations
 RemoveObsoletes=yes
-ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools, gnome-session-flashback
+#ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
-# hints for for stuff that should be done early
+# hints for for stuff that should be done right after the cache calculated
-PostUpgradePurge=ltsp-client, ltspfsd
+# the dist-upgrade (not to be confused with the PostUpgrade hooks in the
-PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp, kdm, xsettings-kde
+# quirks handling)
-PostUpgradeUpgrade=brasero,edubuntu-desktop
+#PostUpgradePurge=linux-restricted-modules-common
+#PostUpgradeRemove=xsettings-kde
+#PostUpgradeUpgrade=brasero,edubuntu-desktop
 #PostUpgradeInstall=apt
-PostInstallScripts=./trisquel-postinstall.sh
+PostInstallScripts=./xorg_fix_proprietary.py
 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=3.2.0
+Version=4.2.0
-BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm
+BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,
-Types=386,ec2,generic,rt,server,virtual
+  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]
@@ -47,8 +52,7 @@ ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, gdm, no
 
 [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
-PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager
 
 [Files]
 BackupExt=distUpgrade
@@ -56,11 +60,11 @@ LogDir=/var/log/dist-upgrade/
 
 [Sources]
 From=belenos
-To=fridas
+To=flidas
 ValidOrigin=Trisquel
 ValidMirrors = mirrors.cfg
 Components=main
-Pockets=security,updates,backports
+Pockets=security,updates,proposed,backports
 ;AllowThirdParty=False
 
 ;[PreRequists]

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

@@ -0,0 +1,91 @@
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk3,DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
+#View=DistUpgradeViewNonInteractive
+#Depends= python-apt (>= 0.6.0), apt (>= 0.6)
+# 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=gnumeric, hpijs, xserver-xorg-video-all
+KeepInstalledSection=translations
+RemoveObsoletes=yes
+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=./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=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
+# 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
+
+[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
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=belenos
+To=fridas
+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
+
+[Aufs]
+; this is a xor option, either full or chroot overlay
+;EnableFullOverlay=yes
+;EnableChrootOverlay=yes
+; sync changes from the chroot back to the real system
+;EnableChrootRsync=yes
+; what chroot dir to use
+;ChrootDir=/tmp/upgrade-chroot
+; the RW dir to use (either for full overlay or chroot overlay)
+;RWDir=/tmp/upgrade-rw
+
+[Network]
+MaxRetries=3
+
+[NonInteractive]
+ForceOverwrite=yes
+RealReboot=no
+DebugBrokenScripts=no
+DpkgProgressLog=no
+;TerminalTimeout=2400

helpers/make-ubuntu-release-upgrader

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#    Copyright (C) 2008-2010  Rubén Rodríguez <ruben@trisquel.info>
+#    Copyright (C) 2008-2017  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=12
+VERSION=1
 
 . ./config
 
@@ -31,10 +31,7 @@ VERSION=12
 rm ./DistUpgrade/xorg_fix_proprietary.py
 rm ./DistUpgrade/NvidiaDetector
 sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i
-#sed s/self._test_and_warn_on_old_nvidia/#self._test_and_warn_on_old_nvidia/  -i DistUpgrade/DistUpgradeQuirks.py
+sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUpgradeQuirks.py
-#sed s/self._test_and_warn_on_nvidia_and_no_sse/#self._test_and_warn_on_nvidia_and_no_sse/  -i DistUpgrade/DistUpgradeQuirks.py
-sed s/self._test_and_warn_on_dropped_fglrx_support/#self._test_and_warn_on_dropped_fglrx_support/  -i DistUpgrade/DistUpgradeQuirks.py
-sed 's/self._add_extras_repository()/#self._add_extras_repository()/' -i DistUpgrade/DistUpgradeQuirks.py
 sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py
 sed '/nvidia/d' DistUpgrade/build-tarball.sh -i
 rm tests/test-data/xorg.conf.fglrx
@@ -275,6 +272,9 @@ 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
+rpl 16\.04 8\.0 po/* -R
+rpl 16\.04 8\.0 DistUpgrade/*.ui -R
+replace '16.04' '8.0' . -R
 rpl $UPSTREAM $CODENAME . -R
 rpl oneiric brigantia . -R
 rpl natty dagda . -R
@@ -285,12 +285,9 @@ rpl jaunty dwyn . -R
 rpl hardy robur . -R
 rpl lucid taranis . -R
 rpl precise toutatis . -R
+rpl trusty belenos . -R
 
-rm ./data/demoted.cfg ./DistUpgrade/demoted.cfg.hardy ./DistUpgrade/demoted.cfg.lucid
+rm ./data/demoted.cfg ./DistUpgrade/demoted.cfg.trusty utils/demoted.cfg.trusty data/demoted.cfg.trusty
-#cp ./utils/demoted.cfg.precise data/demoted.cfg
-#cp ./utils/demoted.cfg.precise utils/demoted.cfg
-rm utils/demoted.cfg.lucid utils/demoted.cfg.hardy utils/demoted.cfg.dapper utils/demoted.cfg.precise
-
 echo "notification-daemon" > data/demoted.cfg
 echo "notification-daemon" $DATA/demoted utils/demoted.cfg
 
@@ -317,7 +314,10 @@ rpl archive.ubuntu.com/ubuntu es.archive.trisquel.info/trisquel . -R
 rpl security.ubuntu.com/ubuntu archive.trisquel.info/trisquel . -R
 rpl archive.ubuntu.com es.archive.trisquel.info . -R
 rpl security.ubuntu.com archive.trisquel.info . -R
-sed 's/main restricted" %/main\\n" %/g' DistUpgrade/DistUpgradeController.py -i
+
+sed 's/"main", "restricted", "universe", "multiverse"/"main"/g' DistUpgrade/DistUpgradeController.py -i utils/demotions.py
+sed '/restricted/d' -i utils/demotions.py
+sed 's/"main", "restricted"/"main"/g' DistUpgrade/DistUpgradeController.py -i
 rpl "main restricted" "main" DistUpgrade -R
 sed 's/,"restricted"//g' DistUpgrade/DistUpgradeController.py -i
 #sed 's/","restricted"/\\n"/g' DistUpgrade/DistUpgradeController.py -i