diff --git a/helpers/DATA/postgresql-common/supported-versions-trisquel.patch b/helpers/DATA/postgresql-common/supported-versions-trisquel.patch index 6eeac1c91a1a337a488da3921587322860832b3e..08fff1d0d1a3bda290acbb3296866984424d1f66 100644 --- a/helpers/DATA/postgresql-common/supported-versions-trisquel.patch +++ b/helpers/DATA/postgresql-common/supported-versions-trisquel.patch @@ -24,6 +24,9 @@ + ;; + 7.0*) # Belenos + /bin/echo -e "9.3" ++ ;; ++ 8.0*) # Belenos ++ /bin/echo -e "9.4" + ;; + *) + echo "supported_versions: WARNING: Unknown Trisquel release: $1" >&2 diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg index b3bcd0560aa70ec499d13edd9ac5e2db7f5725e7..2182c66d5e28e9a348b42d1af2f3bdd79ff0b997 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg @@ -55,8 +55,8 @@ BackupExt=distUpgrade LogDir=/var/log/dist-upgrade/ [Sources] -From=toutatis -To=belenos +From=belenos +To=fridas ValidOrigin=Trisquel ValidMirrors = mirrors.cfg Components=main diff --git a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.toutatis b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos similarity index 99% rename from helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.toutatis rename to helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos index b3bcd0560aa70ec499d13edd9ac5e2db7f5725e7..e934f7ae19c78fbfc101a2247a9861457785df4f 100644 --- a/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.toutatis +++ b/helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg.belenos @@ -55,8 +55,8 @@ BackupExt=distUpgrade LogDir=/var/log/dist-upgrade/ [Sources] -From=toutatis -To=belenos +From=belenos +To=flidas ValidOrigin=Trisquel ValidMirrors = mirrors.cfg Components=main diff --git a/helpers/DATA/update-manager/index.docbook b/helpers/DATA/update-manager/index.docbook index 2fde169e84198fd8feb3dca50aad39b8a16dc488..5818c74f836f29156e99f468a8a96be5df75479b 100644 --- a/helpers/DATA/update-manager/index.docbook +++ b/helpers/DATA/update-manager/index.docbook @@ -538,10 +538,10 @@ update-manager 'content' of the repository. Example of the command syntax could look like this.</para> <programlisting> -<command>deb ftp://archive.trisquel.info/trisquel/ belenos main</command> +<command>deb ftp://archive.trisquel.info/trisquel/ flidas main</command> </programlisting> <para>This example would define the software sources as a Debian source - at trisquel.info containing the belenos release. + at trisquel.info containing the flidas release. </para> </sect3> <sect3 id="remove-sources"> diff --git a/helpers/make-software-properties b/helpers/make-software-properties index d02715016d359274e2a23a4d0897646550a3b8e3..0b5a636e10f40a1e25296309a0e39c4135a33bab 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -31,6 +31,7 @@ cat << EOF | patch -p1 - (deb_line, file) = shortcut.expand(codename=self.distro.codename) + codenames = {} ++ codenames["flidas"] = "xenial" + codenames["belenos"] = "trusty" + codenames["toutatis"] = "precise" + codenames["brigantia"] = "oneiric" diff --git a/helpers/make-unity b/helpers/make-unity index 93d98b9878714693894d5169a8f230ba3b147dc5..e38fce65d87d8c8e2c9e2e568b7a2149204bfa22 100644 --- a/helpers/make-unity +++ b/helpers/make-unity @@ -64,7 +64,7 @@ s/ubuntu-software-center/gnome-app-install/' com.canonical.Unity.gschema.xml rm dash/previews/Skype.png # replace default background -sed -i 's/warty-final-ubuntu/belenos/' tests/data/external.gschema.xml +sed -i 's/warty-final-ubuntu/flidas/' tests/data/external.gschema.xml changelog "Replace default applications in launcher, and adapt for Trisquel"