From 4dc0761f07e17cea6779cc4697b661d06c4076bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Rodr=C3=ADguez?= <ruben@trisquel.info>
Date: Tue, 23 Apr 2013 19:10:59 +0200
Subject: [PATCH] Added upgrade paths to update-manager

---
 helpers/DATA/update-manager/DistUpgrade.cfg   | 10 +--
 .../DATA/update-manager/DistUpgrade.cfg.awen  | 84 -----------------
 .../update-manager/DistUpgrade.cfg.brigantia  | 90 -------------------
 .../DATA/update-manager/DistUpgrade.cfg.dagda | 90 -------------------
 ...grade.cfg.slaine => DistUpgrade.cfg.robur} | 46 +++++-----
 .../update-manager/DistUpgrade.cfg.taranis    | 38 ++++----
 helpers/make-update-manager                   | 19 +++-
 7 files changed, 64 insertions(+), 313 deletions(-)
 delete mode 100644 helpers/DATA/update-manager/DistUpgrade.cfg.awen
 delete mode 100644 helpers/DATA/update-manager/DistUpgrade.cfg.brigantia
 delete mode 100644 helpers/DATA/update-manager/DistUpgrade.cfg.dagda
 rename helpers/DATA/update-manager/{DistUpgrade.cfg.slaine => DistUpgrade.cfg.robur} (64%)

diff --git a/helpers/DATA/update-manager/DistUpgrade.cfg b/helpers/DATA/update-manager/DistUpgrade.cfg
index 257ca393..44308e10 100644
--- a/helpers/DATA/update-manager/DistUpgrade.cfg
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg
@@ -16,13 +16,13 @@ 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
+KeepInstalledPkgs=gnumeric, hpijs
 KeepInstalledSection=translations
 RemoveObsoletes=yes
 ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
 # hints for for stuff that should be done early
 PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common
-PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp
+PostUpgradeRemove=casper, libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp
 PostUpgradeUpgrade=brasero
 #PostUpgradeInstall=apt
 PostInstallScripts=./trisquel-postinstall.sh
@@ -42,13 +42,13 @@ Types=386,ec2,generic,rt,server,virtual
 [trisquel]
 KeyDependencies=gdm
 # those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
 ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
 
 [trisquel-mini]
 KeyDependencies=trisquel-mini-data lxdm
-#Remove previous gnome component from lubuntu to avoid pulling gnome depends on upgrade (LP: #945215)
-PostUpgradeRemove=gnome-bluetooth, gnome-power-manager
+#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
diff --git a/helpers/DATA/update-manager/DistUpgrade.cfg.awen b/helpers/DATA/update-manager/DistUpgrade.cfg.awen
deleted file mode 100644
index 2ea42a65..00000000
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.awen
+++ /dev/null
@@ -1,84 +0,0 @@
-[View]
-# the views will be tried in this order, if one fails to import, the next
-# is tried
-View=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
-BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-gnome-base
-PostUpgradePurge=xorg-common, libgl1-mesa, ltsp-client, ltspfsd, python2.3
-Demotions=demoted.cfg
-RemoveEssentialOk=sysvinit, sysvutils
-RemovalBlacklistFile=removal_blacklist.cfg
-# if those packages were installed, make sure to keep them installed
-KeepInstalledPkgs=gnumeric, hpijs, grub
-KeepInstalledSection=translations
-RemoveObsoletes=yes
-ForcedObsoletes=esound, esound-common, slocate, ksplash-engine-moodin, powernowd
-# example rule
-#PostUpgrade{Install,Remove,Purge}=evms
-# libflashsupport is now oboselete and causes problems so we remove it
-# early
-PostUpgradeRemove=libflashsupport,casper,ubiquity
-PostUpgradeUpgrade=brasero
-PostInstallScripts=./trisquel-postinstall.sh
-#EnableApport=no
-# this supported blacklisting certain versions to ensure we do not upgrade
-# to a known broken version. python2.6 was broken during intrepid->jaunty
-BadVersions=python2.6_2.6.1-1ubuntu8,python-central_0.6.11ubuntu5
-
-[KernelRemoval]
-Version=2.6.28
-BaseNames=linux-image,linux-headers,linux-image-debug,linux-ubuntu-modules,linux-header-lum,linux-backport-modules,linux-header-lbm,linux-restricted-modules
-Types=386,generic,rt,server,virtual
-
-# information about the individual meta-pkgs
-[trisquel-gnome-base]
-KeyDependencies=gdm, usplash-theme-trisquel, trisquel-sounds
-# those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface
-ForcedObsoletes=desktop-effects, cups-pdf, gnome-app-install, policykit-gnome, gnome-mount
-
-[Files]
-BackupExt=distUpgrade
-LogDir=/var/log/dist-upgrade
-
-[Sources]
-From=dwyn
-To=awen
-ValidOrigin=Trisquel
-ValidMirrors = mirrors.cfg
-Components=main
-
-;[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
diff --git a/helpers/DATA/update-manager/DistUpgrade.cfg.brigantia b/helpers/DATA/update-manager/DistUpgrade.cfg.brigantia
deleted file mode 100644
index c5392dc8..00000000
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.brigantia
+++ /dev/null
@@ -1,90 +0,0 @@
-[View]
-# the views will be tried in this order, if one fails to import, the next
-# is tried
-View=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, trisquel-mini, triskel
-BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-minimal
-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
-# 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, gnome-session, gnome-shell, abrowser-globalmenu, appmenu-gtk3, appmenu-gtk 
-PostUpgradeUpgrade=brasero
-#PostUpgradeInstall=apt
-PostInstallScripts=./trisquel-postinstall.sh
-EnableApport=no
-# 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=2.6.38
-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=lightdm, trisquel-gtk-theme, trisquel-sounds
-# those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner, gnome-session, gnome-shell, abrowser-globalmenu, appmenu-gtk3, appmenu-gtk
-ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
-
-[trisquel-mini]
-KeyDependencies=lxde, lxdm, trisquel-mini-data
-ForcedObsoletes=cups-pdf
-
-[Files]
-BackupExt=distUpgrade
-LogDir=/var/log/dist-upgrade/
-
-[Sources]
-From=dagda
-To=brigantia
-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
diff --git a/helpers/DATA/update-manager/DistUpgrade.cfg.dagda b/helpers/DATA/update-manager/DistUpgrade.cfg.dagda
deleted file mode 100644
index 054d2c17..00000000
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.dagda
+++ /dev/null
@@ -1,90 +0,0 @@
-[View]
-# the views will be tried in this order, if one fails to import, the next
-# is tried
-View=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, trisquel-mini, triskel
-BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-minimal
-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
-# 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
-PostUpgradeUpgrade=brasero
-#PostUpgradeInstall=apt
-PostInstallScripts=./trisquel-postinstall.sh
-EnableApport=no
-# 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=2.6.35
-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=gdm, trisquel-gtk-theme, trisquel-sounds
-# those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
-ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
-
-[trisquel-mini]
-KeyDependencies=lxde, lxdm, trisquel-mini-data
-ForcedObsoletes=cups-pdf
-
-[Files]
-BackupExt=distUpgrade
-LogDir=/var/log/dist-upgrade/
-
-[Sources]
-From=slaine
-To=dagda
-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
diff --git a/helpers/DATA/update-manager/DistUpgrade.cfg.slaine b/helpers/DATA/update-manager/DistUpgrade.cfg.robur
similarity index 64%
rename from helpers/DATA/update-manager/DistUpgrade.cfg.slaine
rename to helpers/DATA/update-manager/DistUpgrade.cfg.robur
index 58a74f7d..91f465fa 100644
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.slaine
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.robur
@@ -16,51 +16,48 @@ 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
+KeepInstalledPkgs=gnumeric, hpijs
 KeepInstalledSection=translations
 RemoveObsoletes=yes
 ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
-# 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
-PostUpgradeUpgrade=brasero
+# libflashsupport is now oboselete and causes problems so we remove it
+# early
+PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common
+PostUpgradeRemove=casper, libflashsupport, slocate, gtk-qt-engine, libparted1.8-12, usplash
 #PostUpgradeInstall=apt
 PostInstallScripts=./trisquel-postinstall.sh
-EnableApport=no
 # 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/
+#  - the openoffice.org-filter-binfilter causes a pre-depends cycle error
+#    (#516727)
+BadVersions=openoffice.org-filter-binfilter_1:3.2.0~rc4-1ubuntu1
+EnableApport=no
 
 [KernelRemoval]
-Version=2.6.32
-BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm
-Types=386,ec2,generic,rt,server,virtual
+Version=2.6.24
+BaseNames=linux-image,linux-headers,linux-image-debug,linux-ubuntu-modules,linux-header-lum,linux-backport-modules,linux-header-lbm,linux-restricted-modules
+Types=386,generic,rt,server,virtual
 
-# information about the individual meta-pkgs
 [trisquel]
-KeyDependencies=gdm, trisquel-gtk-theme, trisquel-sounds
+KeyDependencies=gdm
 # those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
 ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
 
 [trisquel-mini]
-KeyDependencies=lxde, lxdm, trisquel-mini-data
-ForcedObsoletes=cups-pdf
+KeyDependencies=trisquel-mini-data lxdm
+#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=taranis
-To=slaine
+From=robur
+To=toutatis
 ValidOrigin=Trisquel
 ValidMirrors = mirrors.cfg
 Components=main
-Pockets=security,updates,backports
-;AllowThirdParty=False
 
 ;[PreRequists]
 ;Packages=release-upgrader-apt,release-upgrader-dpkg
@@ -83,8 +80,5 @@ Pockets=security,updates,backports
 MaxRetries=3
 
 [NonInteractive]
-ForceOverwrite=yes
+ForceOverwrite=no
 RealReboot=no
-DebugBrokenScripts=no
-DpkgProgressLog=no
-;TerminalTimeout=2400
diff --git a/helpers/DATA/update-manager/DistUpgrade.cfg.taranis b/helpers/DATA/update-manager/DistUpgrade.cfg.taranis
index a7009c8d..50f12581 100644
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.taranis
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.taranis
@@ -1,7 +1,7 @@
 [View]
 # the views will be tried in this order, if one fails to import, the next
 # is tried
-View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText
+View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
 #View=DistUpgradeViewNonInteractive
 #Depends= python-apt (>= 0.6.0), apt (>= 0.6)
 # the views below support upgrades over ssh connection
@@ -10,52 +10,57 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
 # Distro contains global information about the upgrade
 [Distro]
 # the meta-pkgs we support
-MetaPkgs=trisquel
-BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-gnome-base
+MetaPkgs=trisquel, trisquel-mini
+BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-gnome-base, trisquel-minimal
 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, mysql-server, mysql-client
+KeepInstalledPkgs=gnumeric, hpijs
 KeepInstalledSection=translations
 RemoveObsoletes=yes
 ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
 # hints for for stuff that should be done early
-PostUpgradePurge=ltsp-client, ltspfsd
-PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash
+PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common
+PostUpgradeRemove=casper, libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp
 PostUpgradeUpgrade=brasero
 #PostUpgradeInstall=apt
 PostInstallScripts=./trisquel-postinstall.sh
-EnableApport=no
+EnableApport=yes
 # this supported blacklisting certain versions to ensure we do not upgrade
-#  - the openoffice.org-filter-binfilter causes a pre-depends cycle error
-#    (#516727)
-BadVersions=openoffice.org-filter-binfilter_1:3.2.0~rc4-1ubuntu1
+#  - 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=2.6.31
+Version=3.0.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-gnome-base]
-KeyDependencies=gdm, trisquel-sounds
+[trisquel]
+KeyDependencies=gdm
 # those pkgs will be marked remove right after the distUpgrade in the cache
-PostUpgradeRemove=xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
+PostUpgradeRemove=casper, xscreensaver, gnome-cups-manager, powermanagement-interface, deskbar-applet, nautilus-cd-burner
 ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
 
+[trisquel-mini]
+KeyDependencies=trisquel-mini-data lxdm
+#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=awen
-To=taranis
+From=taranis
+To=toutatis
 ValidOrigin=Trisquel
 ValidMirrors = mirrors.cfg
 Components=main
+Pockets=security,updates,backports
 
 ;[PreRequists]
 ;Packages=release-upgrader-apt,release-upgrader-dpkg
@@ -83,3 +88,4 @@ RealReboot=no
 DebugBrokenScripts=no
 DpkgProgressLog=no
 ;TerminalTimeout=2400
+
diff --git a/helpers/make-update-manager b/helpers/make-update-manager
index 4f2363d8..4e9fc934 100644
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -21,7 +21,7 @@
 # gpg -ba release_name.tar.gz
 # Also, don't forget to update the meta-release files at archive and packages.t.i
 
-VERSION=6
+VERSION=12
 
 . ./config
 
@@ -39,6 +39,20 @@ rm tests/test-data/xorg.conf.fglrx
 apt-get remove --purge -y nvidia-common  || true 
 apt-get remove --purge -y fglrx-modaliases || true
 
+#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
+cat << EOF >> DistUpgrade/DistUpgradeQuirks.py
+
+    def from_taranisPostInitialUpdate(self):
+        logging.debug("Setting APT::Immediate-Configure=false")
+        apt.apt_pkg.config.set("APT::Immediate-Configure", "false")
+        os.system("apt-get install --force-yes -y libblkid1 lzma dpkg")
+
+    def from_taranisPostCleanup(self):
+        logging.debug("Setting APT::Immediate-Configure=true")
+        apt.apt_pkg.config.set("APT::Immediate-Configure", "true")
+EOF
+
+
 rm ./DistUpgrade/Ubuntu.info
 cat << EOF   > DistUpgrade/Trisquel.info
 ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/%s
@@ -81,6 +95,7 @@ cat << EOF >  DistUpgrade/ReleaseAnnouncement
 = Welcome to Trisquel GNU/Linux $REVISION '$CODENAME' =
 
 The Trisquel team is proud to announce Trisquel $REVISION '$CODENAME'.
+We recommend to apply all pending updates to the system before upgrading.
 
 Trisquel is a fully free operating system based in GNU/Linux, for domestic
 users, small enterprises and educational centers.
@@ -209,7 +224,6 @@ EOF
 
 rm DistUpgrade/DistUpgrade.cfg*
 cp $DATA/DistUpgrade.cfg* DistUpgrade/
-cp $DATA/DistUpgrade.cfg.$CODENAME DistUpgrade/DistUpgrade.cfg
 
 cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
 #!/bin/sh
@@ -288,3 +302,4 @@ changelog "Compiled for Trisquel"
 
 compile
 
+cp ../dist-upgrader* /root
-- 
GitLab