From 0e9936f851251ddc4176ade69ae1c2efbc1ddfd6 Mon Sep 17 00:00:00 2001
From: Santiago Rodriguez <santi@trisquel.info>
Date: Tue, 23 Feb 2016 00:49:26 +0100
Subject: [PATCH] Replace ocurrences from "belenos" to "flidas"
---
.../DATA/postgresql-common/supported-versions-trisquel.patch | 3 +++
helpers/DATA/ubuntu-release-upgrader/DistUpgrade.cfg | 4 ++--
.../{DistUpgrade.cfg.toutatis => DistUpgrade.cfg.belenos} | 4 ++--
helpers/DATA/update-manager/index.docbook | 4 ++--
helpers/make-software-properties | 1 +
helpers/make-unity | 2 +-
6 files changed, 11 insertions(+), 7 deletions(-)
rename helpers/DATA/ubuntu-release-upgrader/{DistUpgrade.cfg.toutatis => DistUpgrade.cfg.belenos} (99%)
diff --git a/helpers/DATA/postgresql-common/supported-versions-trisquel.patch b/helpers/DATA/postgresql-common/supported-versions-trisquel.patch
index 6eeac1c9..08fff1d0 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 b3bcd056..2182c66d 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 b3bcd056..e934f7ae 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 2fde169e..5818c74f 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 d0271501..0b5a636e 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 93d98b98..e38fce65 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"
--
GitLab