Added extra upgrade paths to update-manager

d8a5f064 · Ruben Rodriguez · 042f42c5 · d8a5f064 · d8a5f064 · d8a5f064
Commit d8a5f064 authored 12 years ago by Ruben Rodriguez
--- a/helpers/DATA/update-manager/DistUpgrade.cfg
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg
+[View]
+# the views will be tried in this order, if one fails to import, the next
+# is tried
+View=DistUpgradeViewGtk,DistUpgradeViewGtk3,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
+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
+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
+PostUpgradeUpgrade=brasero
+#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.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]
+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
+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
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=brigantia
+To=toutatis
+ValidOrigin=Trisquel
+ValidMirrors = mirrors.cfg
+Components=main
+Pockets=security,updates,backports
+
+;[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
+
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.awen
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.awen
+[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
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.brigantia
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.brigantia
+[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
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.dagda
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.dagda
+[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
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.slaine
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.slaine
+[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
+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
+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
+#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.32
+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=taranis
+To=slaine
+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
--- a/helpers/DATA/update-manager/DistUpgrade.cfg.taranis
+++ b/helpers/DATA/update-manager/DistUpgrade.cfg.taranis
+[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
+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
+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
+PostUpgradeUpgrade=brasero
+#PostUpgradeInstall=apt
+PostInstallScripts=./trisquel-postinstall.sh
+EnableApport=no
+# 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
+# ubiquity slideshow
+#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
+
+[KernelRemoval]
+Version=2.6.31
+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
+# 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
+
+[Files]
+BackupExt=distUpgrade
+LogDir=/var/log/dist-upgrade/
+
+[Sources]
+From=awen
+To=taranis
+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
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -207,99 +207,9 @@ http://in.archive.trisquel.info/
 ftp://in.archive.trisquel.info/
 EOF

-rm DistUpgrade/DistUpgrade.cfg
-cat << EOF > DistUpgrade/DistUpgrade.cfg
-[View]
-# the views will be tried in this order, if one fails to import, the next
-# is tried
-View=DistUpgradeViewGtk,DistUpgradeViewGtk3,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
-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
-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
-PostUpgradeUpgrade=brasero
-#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.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]
-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
-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
-
-[Files]
-BackupExt=distUpgrade
-LogDir=/var/log/dist-upgrade/
-
-[Sources]
-From=brigantia
-To=toutatis
-ValidOrigin=Trisquel
-ValidMirrors = mirrors.cfg
-Components=main
-Pockets=security,updates,backports
-
-;[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
-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
@@ -346,6 +256,13 @@ rpl lucid taranis . -R
 rpl karmic awen . -R
 rpl jaunty dwyn . -R
 rpl hardy robur . -R
+#mv DistUpgrade/demoted.cfg.precise DistUpgrade/demoted.cfg.brigantia
+#mv DistUpgrade/demoted.cfg.natty DistUpgrade/demoted.cfg.dagda
+#mv DistUpgrade/demoted.cfg.maverick DistUpgrade/demoted.cfg.slaine
+mv DistUpgrade/demoted.cfg.lucid DistUpgrade/demoted.cfg.taranis
+#mv DistUpgrade/demoted.cfg.karmik DistUpgrade/demoted.cfg.awen
+#mv DistUpgrade/demoted.cfg.jaunty DistUpgrade/demoted.cfg.dwyn
+mv DistUpgrade/demoted.cfg.hardy DistUpgrade/demoted.cfg.robur
 rpl " Ubuntu " " Trisquel " . -R
 rpl "Ubuntu " "Trisquel " . -R
 rpl " Ubuntu" " Trisquel" . -R