CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added upgrade paths to update-manager

Browse source
This commit is contained in:
Rubén Rodríguez 2013-04-23 19:10:59 +02:00
parent c94bde3f48
commit 4dc0761f07
7 changed files with 64 additions and 313 deletions
Download patch file Download diff file Expand all files Collapse all files

10
helpers/DATA/update-manager/DistUpgrade.cfg
View file

@ -16,13 +16,13 @@ Demotions=demoted.cfg
RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
RemovalBlacklistFile=removal_blacklist.cfg RemovalBlacklistFile=removal_blacklist.cfg
# if those packages were installed, make sure to keep them installed # if those packages were installed, make sure to keep them installed
KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all KeepInstalledPkgs=gnumeric, hpijs
KeepInstalledSection=translations KeepInstalledSection=translations
RemoveObsoletes=yes RemoveObsoletes=yes
ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools 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 early
PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common 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 PostUpgradeUpgrade=brasero
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh PostInstallScripts=./trisquel-postinstall.sh
@ -42,13 +42,13 @@ Types=386,ec2,generic,rt,server,virtual
[trisquel] [trisquel]
KeyDependencies=gdm KeyDependencies=gdm
# those pkgs will be marked remove right after the distUpgrade in the cache # 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 ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
[trisquel-mini] [trisquel-mini]
KeyDependencies=trisquel-mini-data lxdm KeyDependencies=trisquel-mini-data lxdm
#Remove previous gnome component from lubuntu to avoid pulling gnome depends on upgrade (LP: #945215) #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
PostUpgradeRemove=gnome-bluetooth, gnome-power-manager PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager
[Files] [Files]
BackupExt=distUpgrade BackupExt=distUpgrade

84
helpers/DATA/update-manager/DistUpgrade.cfg.awen
View file

@ -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

90
helpers/DATA/update-manager/DistUpgrade.cfg.brigantia
View file

@ -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

90
helpers/DATA/update-manager/DistUpgrade.cfg.dagda
View file

@ -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

46
helpers/DATA/update-manager/DistUpgrade.cfg.slaine → helpers/DATA/update-manager/DistUpgrade.cfg.robur
View file

@ -16,51 +16,48 @@ Demotions=demoted.cfg
RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
RemovalBlacklistFile=removal_blacklist.cfg RemovalBlacklistFile=removal_blacklist.cfg
# if those packages were installed, make sure to keep them installed # if those packages were installed, make sure to keep them installed
KeepInstalledPkgs=gnumeric, hpijs, xserver-xorg-video-all KeepInstalledPkgs=gnumeric, hpijs
KeepInstalledSection=translations KeepInstalledSection=translations
RemoveObsoletes=yes RemoveObsoletes=yes
ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools
# hints for for stuff that should be done early # libflashsupport is now oboselete and causes problems so we remove it
PostUpgradePurge=ltsp-client, ltspfsd # early
PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common
PostUpgradeUpgrade=brasero PostUpgradeRemove=casper, libflashsupport, slocate, gtk-qt-engine, libparted1.8-12, usplash
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh PostInstallScripts=./trisquel-postinstall.sh
EnableApport=no
# this supported blacklisting certain versions to ensure we do not upgrade # this supported blacklisting certain versions to ensure we do not upgrade
# - blcr-dkms fails to build on kernel 2.6.35 # - the openoffice.org-filter-binfilter causes a pre-depends cycle error
BadVersions=blcr-dkms_0.8.2-13 # (#516727)
# ubiquity slideshow BadVersions=openoffice.org-filter-binfilter_1:3.2.0~rc4-1ubuntu1
#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ EnableApport=no
[KernelRemoval] [KernelRemoval]
Version=2.6.32 Version=2.6.24
BaseNames=linux-image,linux-headers,linux-image-debug,linux-backport-modules,linux-header-lbm 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,ec2,generic,rt,server,virtual Types=386,generic,rt,server,virtual
# information about the individual meta-pkgs
[trisquel] [trisquel]
KeyDependencies=gdm, trisquel-gtk-theme, trisquel-sounds KeyDependencies=gdm
# those pkgs will be marked remove right after the distUpgrade in the cache # 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 ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount
[trisquel-mini] [trisquel-mini]
KeyDependencies=lxde, lxdm, trisquel-mini-data KeyDependencies=trisquel-mini-data lxdm
ForcedObsoletes=cups-pdf #Remove previous gnome component from ltrisquel to avoid pulling gnome depends on upgrade (LP: #945215)
PostUpgradeRemove=casper, gnome-bluetooth, gnome-power-manager
[Files] [Files]
BackupExt=distUpgrade BackupExt=distUpgrade
LogDir=/var/log/dist-upgrade/ LogDir=/var/log/dist-upgrade/
[Sources] [Sources]
From=taranis From=robur
To=slaine To=toutatis
ValidOrigin=Trisquel ValidOrigin=Trisquel
ValidMirrors = mirrors.cfg ValidMirrors = mirrors.cfg
Components=main Components=main
Pockets=security,updates,backports
;AllowThirdParty=False
;[PreRequists] ;[PreRequists]
;Packages=release-upgrader-apt,release-upgrader-dpkg ;Packages=release-upgrader-apt,release-upgrader-dpkg
@ -83,8 +80,5 @@ Pockets=security,updates,backports
MaxRetries=3 MaxRetries=3
[NonInteractive] [NonInteractive]
ForceOverwrite=yes ForceOverwrite=no
RealReboot=no RealReboot=no
DebugBrokenScripts=no
DpkgProgressLog=no
;TerminalTimeout=2400

38
helpers/DATA/update-manager/DistUpgrade.cfg.taranis
View file

@ -1,7 +1,7 @@
[View] [View]
# the views will be tried in this order, if one fails to import, the next # the views will be tried in this order, if one fails to import, the next
# is tried # is tried
View=DistUpgradeViewGtk,DistUpgradeViewKDE,DistUpgradeViewText View=DistUpgradeViewGtk,DistUpgradeViewGtk3,DistUpgradeViewKDE,DistUpgradeViewText
#View=DistUpgradeViewNonInteractive #View=DistUpgradeViewNonInteractive
#Depends= python-apt (>= 0.6.0), apt (>= 0.6) #Depends= python-apt (>= 0.6.0), apt (>= 0.6)
# the views below support upgrades over ssh connection # the views below support upgrades over ssh connection
@ -10,52 +10,57 @@ SupportSSH=DistUpgradeViewText,DistUpgradeViewNonInteractive
# Distro contains global information about the upgrade # Distro contains global information about the upgrade
[Distro] [Distro]
# the meta-pkgs we support # the meta-pkgs we support
MetaPkgs=trisquel MetaPkgs=trisquel, trisquel-mini
BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-gnome-base BaseMetaPkgs=trisquel-base, trisquel-desktop-common, trisquel-gnome-base, trisquel-minimal
Demotions=demoted.cfg Demotions=demoted.cfg
RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin RemoveEssentialOk=sysvinit, sysvutils, belocs-locales-bin
RemovalBlacklistFile=removal_blacklist.cfg RemovalBlacklistFile=removal_blacklist.cfg
# if those packages were installed, make sure to keep them installed # 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 KeepInstalledSection=translations
RemoveObsoletes=yes RemoveObsoletes=yes
ForcedObsoletes=ksplash-engine-moodin, powernowd, laptop-mode-tools 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 early
PostUpgradePurge=ltsp-client, ltspfsd PostUpgradePurge=ltsp-client, ltspfsd, linux-restricted-modules-common
PostUpgradeRemove=libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash PostUpgradeRemove=casper, libflashsupport, kvm-source, gtk-qt-engine, libparted1.8-12, usplash, printconf, foomatic-db-gutenprint, ebox-printers, kbluetooth, kde-plasmoid-cwp
PostUpgradeUpgrade=brasero PostUpgradeUpgrade=brasero
#PostUpgradeInstall=apt #PostUpgradeInstall=apt
PostInstallScripts=./trisquel-postinstall.sh PostInstallScripts=./trisquel-postinstall.sh
EnableApport=no EnableApport=yes
# this supported blacklisting certain versions to ensure we do not upgrade # this supported blacklisting certain versions to ensure we do not upgrade
# - the openoffice.org-filter-binfilter causes a pre-depends cycle error # - blcr-dkms fails to build on kernel 2.6.35
# (#516727) BadVersions=blcr-dkms_0.8.2-13
BadVersions=openoffice.org-filter-binfilter_1:3.2.0~rc4-1ubuntu1
# ubiquity slideshow # ubiquity slideshow
#SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/ #SlideshowUrl=http://people.canonical.com/~mvo/ubiquity-slideshow-upgrade/slides/
[KernelRemoval] [KernelRemoval]
Version=2.6.31 Version=3.0.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,linux-header-lbm
Types=386,ec2,generic,rt,server,virtual Types=386,ec2,generic,rt,server,virtual
# information about the individual meta-pkgs # information about the individual meta-pkgs
[trisquel-gnome-base] [trisquel]
KeyDependencies=gdm, trisquel-sounds KeyDependencies=gdm
# those pkgs will be marked remove right after the distUpgrade in the cache # 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 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] [Files]
BackupExt=distUpgrade BackupExt=distUpgrade
LogDir=/var/log/dist-upgrade/ LogDir=/var/log/dist-upgrade/
[Sources] [Sources]
From=awen From=taranis
To=taranis To=toutatis
ValidOrigin=Trisquel ValidOrigin=Trisquel
ValidMirrors = mirrors.cfg ValidMirrors = mirrors.cfg
Components=main Components=main
Pockets=security,updates,backports
;[PreRequists] ;[PreRequists]
;Packages=release-upgrader-apt,release-upgrader-dpkg ;Packages=release-upgrader-apt,release-upgrader-dpkg
@ -83,3 +88,4 @@ RealReboot=no
DebugBrokenScripts=no DebugBrokenScripts=no
DpkgProgressLog=no DpkgProgressLog=no
;TerminalTimeout=2400 ;TerminalTimeout=2400

19
helpers/make-update-manager
View file

@ -21,7 +21,7 @@
# gpg -ba release_name.tar.gz # gpg -ba release_name.tar.gz
# Also, don't forget to update the meta-release files at archive and packages.t.i # Also, don't forget to update the meta-release files at archive and packages.t.i
VERSION=6 VERSION=12
. ./config . ./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 nvidia-common || true
apt-get remove --purge -y fglrx-modaliases || 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 rm ./DistUpgrade/Ubuntu.info
cat << EOF > DistUpgrade/Trisquel.info cat << EOF > DistUpgrade/Trisquel.info
ChangelogURI: http://packages.trisquel.info/changelogs/pool/%s/%s/%s/%s_%s/%s 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' = = Welcome to Trisquel GNU/Linux $REVISION '$CODENAME' =
The Trisquel team is proud to announce Trisquel $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 Trisquel is a fully free operating system based in GNU/Linux, for domestic
users, small enterprises and educational centers. users, small enterprises and educational centers.
@ -209,7 +224,6 @@ EOF
rm DistUpgrade/DistUpgrade.cfg* rm DistUpgrade/DistUpgrade.cfg*
cp $DATA/DistUpgrade.cfg* DistUpgrade/ cp $DATA/DistUpgrade.cfg* DistUpgrade/
cp $DATA/DistUpgrade.cfg.$CODENAME DistUpgrade/DistUpgrade.cfg
cat << EOF1 > DistUpgrade/trisquel-postinstall.sh cat << EOF1 > DistUpgrade/trisquel-postinstall.sh
#!/bin/sh #!/bin/sh
@ -288,3 +302,4 @@ changelog "Compiled for Trisquel"
compile compile
cp ../dist-upgrader* /root