4 files changed, 20 insertions, 26 deletions
diff --git a/AppImage/curses.yml b/AppImage/curses.yml
index 675b66c..254947a 100755
--- a/AppImage/curses.yml
+++ b/AppImage/curses.yml
@@ -1,28 +1,25 @@
 app: sciteco-curses
 
 ingredients:
-  packages:
-    - sciteco-curses
   dist: focal
   sources:
-    - deb http://archive.ubuntu.com/ubuntu/ jammy main universe
-#  ppas:
-#    - robin-haberkorn/sciteco
-  script:
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-common_nightly_ubuntu-22.04_all.deb"
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-curses_nightly_ubuntu-22.04_amd64.deb"
+    # should always build on the oldest supported version
+    - deb http://archive.ubuntu.com/ubuntu/ focal main universe
+    - deb http://download.opensuse.org/repositories/home:/rhaberkorn:/sciteco:/UNSTABLE/xUbuntu_20.04/ /
+  packages:
+    - sciteco-curses
   post_script:
-    - dpkg -I sciteco-curses*.deb | grep "Version:" | cut -d':' -f2 | cut -d'+' -f1 | sed 's/^[ ]*//g' >VERSION
+    - dpkg -I sciteco-curses*.deb | sed -En 's/ *Version: *(.*)/\1/p' >VERSION
 
 script:
   # This is currently not installed by sciteco-curses.
   # FIXME: There should perhaps be a unique name in the desktop file, so it does not conflict with the Gtk version.
-  - wget -O sciteco-curses.desktop -c "https://raw.githubusercontent.com/rhaberkorn/sciteco/master/src/sciteco.desktop"
+  - wget -O sciteco-curses.desktop -c "https://git.fmsbw.de/sciteco/plain/src/sciteco.desktop"
   - sed -i -e 's@gsciteco@sciteco@g' sciteco-curses.desktop
   - echo 'Terminal=true' >>sciteco-curses.desktop
-  - wget -O sciteco.png -c "https://raw.githubusercontent.com/rhaberkorn/sciteco/master/ico/sciteco-256.png"
+  - wget -O sciteco.png -c "https://git.fmsbw.de/sciteco/plain/ico/sciteco-256.png"
   - mkdir -p ./usr/share/metainfo/
-  - wget -O ./usr/share/metainfo/sciteco-curses.appdata.xml -c "https://raw.githubusercontent.com/rhaberkorn/sciteco/master/AppImage/sciteco-curses.appdata.xml"
+  - wget -O ./usr/share/metainfo/sciteco-curses.appdata.xml -c "https://git.fmsbw.de/sciteco/plain/AppImage/sciteco-curses.appdata.xml"
   # Thinning: These documentation files are pointless.
   # SciTECO comes with its own online help system.
   - rm -rf ./usr/share/doc ./usr/share/man
diff --git a/AppImage/gtk.yml b/AppImage/gtk.yml
index 0ead771..99e834e 100755
--- a/AppImage/gtk.yml
+++ b/AppImage/gtk.yml
@@ -1,22 +1,19 @@
 app: sciteco-gtk
 
 ingredients:
+  dist: focal
+  sources:
+    # should always build on the oldest supported version
+    - deb http://archive.ubuntu.com/ubuntu/ focal main universe
+    - deb http://download.opensuse.org/repositories/home:/rhaberkorn:/sciteco:/UNSTABLE/xUbuntu_20.04/ /
   packages:
     - sciteco-gtk
   exclude:
     # pkg2appimage blacklists Gtk, Pango and other libs from the GNOME stack,
     # so excluding glib as well should actually improve portability.
     - libglib2.0-0
-  dist: focal
-  sources:
-    - deb http://archive.ubuntu.com/ubuntu/ jammy main universe
-#  ppas:
-#    - robin-haberkorn/sciteco
-  script:
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-common_nightly_ubuntu-22.04_all.deb"
-    - wget -c "https://github.com/rhaberkorn/sciteco/releases/download/nightly/sciteco-gtk_nightly_ubuntu-22.04_amd64.deb"
   post_script:
-    - dpkg -I sciteco-gtk*.deb | grep "Version:" | cut -d':' -f2 | cut -d'+' -f1 | sed 's/^[ ]*//g' >VERSION
+    - dpkg -I sciteco-gtk*.deb | sed -En 's/ *Version: *(.*)/\1/p' >VERSION
 
 script:
   # FIXME: There should perhaps be a unique name in the desktop file, so it does not conflict with the Curses version.
@@ -24,7 +21,7 @@ script:
   - cp ./usr/share/icons/hicolor/256x256/apps/sciteco.png ./sciteco.png
   - rm -rf ./usr/share/icons
   - mkdir -p ./usr/share/metainfo/
-  - wget -O ./usr/share/metainfo/sciteco-gtk.appdata.xml -c "https://raw.githubusercontent.com/rhaberkorn/sciteco/master/AppImage/sciteco-gtk.appdata.xml"
+  - wget -O ./usr/share/metainfo/sciteco-gtk.appdata.xml -c "https://git.fmsbw.de/sciteco/plain/AppImage/sciteco-gtk.appdata.xml"
   # Thinning: These documentation files are pointless.
   # SciTECO comes with its own online help system.
   - rm -rf ./usr/share/doc ./usr/share/man
diff --git a/AppImage/sciteco-curses.appdata.xml b/AppImage/sciteco-curses.appdata.xml
index fb114fe..07e956d 100644
--- a/AppImage/sciteco-curses.appdata.xml
+++ b/AppImage/sciteco-curses.appdata.xml
@@ -15,10 +15,10 @@
 		This app contains the curses (terminal) version of SciTECO.
 	</p></description>
 	<launchable type="desktop-id">sciteco-curses.desktop</launchable>
-	<url type="homepage">https://rhaberkorn.github.io/sciteco/</url>
+	<url type="homepage">https://sciteco.fmsbw.de/</url>
 	<screenshots>
 		<screenshot type="default">
-			<image>https://sciteco.sf.net/screenshots/v2.1.0-freebsd-ncurses.png</image>
+			<image>https://sciteco.fmsbw.de/screenshots/v2.1.0-freebsd-ncurses.png</image>
 		</screenshot>
 	</screenshots>
 	<provides>
diff --git a/AppImage/sciteco-gtk.appdata.xml b/AppImage/sciteco-gtk.appdata.xml
index 59e17d7..d65cccf 100644
--- a/AppImage/sciteco-gtk.appdata.xml
+++ b/AppImage/sciteco-gtk.appdata.xml
@@ -15,10 +15,10 @@
 		This app contains the GTK+ 3 (graphical) version of SciTECO.
 	</p></description>
 	<launchable type="desktop-id">sciteco-gtk.desktop</launchable>
-	<url type="homepage">https://rhaberkorn.github.io/sciteco/</url>
+	<url type="homepage">https://sciteco.fmsbw.de/</url>
 	<screenshots>
 		<screenshot type="default">
-			<image>https://sciteco.sf.net/screenshots/v2.3.0-freebsd-gtk.png</image>
+			<image>https://sciteco.fmsbw.de/screenshots/v2.3.0-freebsd-gtk.png</image>
 		</screenshot>
 	</screenshots>
 	<provides>