diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg index c82478182e66799170ca4e4dcb101e8a0647b3ce..d9b890d4315dc7ecc26156251492c64e84493799 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg @@ -49,13 +49,13 @@ Types=386,ec2,generic,generic-lpae,lowlatency,powerpc-e500mc,powerpc-smp, 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 -ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install +ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install, 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 -ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install +ForcedObsoletes=desktop-effects, cups-pdf, policykit-gnome, gnome-mount, notification-daemon, trisquel-session, libcogl15, libcogl-pango15, gnome-app-install, resolvconf [Files] BackupExt=distUpgrade diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader index d2003c4db527928ff02aef56c25fabebbd2c9e0d..464129f9d1692217c66f259bcf4e5e9d0b8142dd 100644 --- a/helpers/make-ubuntu-release-upgrader +++ b/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=5 +VERSION=6 . ./config @@ -213,16 +213,19 @@ EOF rm data/mirrors.cfg cat << EOF > data/mirrors.cfg https://archive.trisquel.info/trisquel/ +https://es.archive.trisquel.info/trisquel/ +https://fr.archive.trisquel.info/trisquel/ https://mirror.fsf.org/trisquel/ -http://mirrors.knoesis.org/trisquel/packages -https://mirrors.ocf.berkeley.edu/trisquel/ -http://in.archive.trisquel.info/trisquel/ -https://mirror.cedia.org.ec/trisquel.packages -http://mirrors.serverhost.ro/trisquel/packages -https://mirrors.ustc.edu.cn/trisquel -https://ftp.caliu.cat/pub/distribucions/trisquel/packages -https://ftp.yzu.edu.tw/Linux/trisquel.packages/ +https://mirror.csclub.uwaterloo.ca/trisquel/ +https://mirrors.ustc.edu.cn/trisquel/ +https://mirror.cedia.org.ec/trisquel.packages/ +https://quantum-mirror.hu/mirrors/pub/trisquel/packages/ +https://ftp.caliu.cat/pub/distribucions/trisquel/packages/ +https://mirror.librelabucm.org/trisquel/ +https://mirror.linux.pizza/trisquel/packages/ https://ftp.acc.umu.se/mirror/trisquel/packages/ +https://ftp.yzu.edu.tw/Linux/trisquel.packages/ +https://mirrors.ocf.berkeley.edu/trisquel/ EOF rm data/DistUpgrade.cfg*