diff --git a/Makefile b/Makefile
deleted file mode 100644
index d80c6be..0000000
--- a/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-# src https://www.pragmaticlinux.com/2021/01/create-a-man-page-for-your-own-program-or-script-with-pandoc/
-man:
- pandoc man/tigerjython.md -s -t man | gzip > man/tigerjython.1.gz
-tar.gz: man
- mkdir -p TigerJython/man
- cp man/tigerjython.1.gz TigerJython/man
- rm -rf TigerJython/*.cfg TigerJython/.tjbackup/
- tar -czf TigerJython.tar.gz TigerJython
-deb: tar.gz
- cd debian-deb && sh makedeb.sh
-b2sum:
- b2sum TigerJython.tar.gz
diff --git a/README.md b/README.md
index 410f723..5fbfbae 100644
--- a/README.md
+++ b/README.md
@@ -2,19 +2,14 @@
Dieses Repo soll helfen TigerJython für Arch, Debian oder Flatpak zu paketieren.
-ArchLinux: https://aur.archlinux.org/packages/tigerjython
+## Builds
-## Ordnerstruktur
-
-Im Repository sind folgende Ordner:
-
- * arch-pkg: paketierung für ArchLinux
- * debian-deb: Paketierung für Debian
- * flatpak: Paketierung für flatpak
- * man: Manual (Basierend auf dem Readme.txt)
- * TigerJython: Quelldateien
- * TigerJython.tar.gz: Tarball von TigerJython
+An folgenden Orten kann man die TigerJython von diesem Repo herunterladen:
+ * Arch Linux: https://aur.archlinux.org/packages/tigerjython
+ * Flatpak: https://flathub.org/apps/ch.tigerjython.TigerJython2
+ * Debian: https://git.jdmweb2.ch/beat/-/packages/debian/tigerjython
+
## Logo
Das vektorisierte Logo stammt von [Pixabay](https://pixabay.com/de/vectors/fu%C3%9Fabdruck-tier-pelzig-pfote-308794/)
diff --git a/arch-pkg b/arch-pkg
deleted file mode 160000
index 27805c2..0000000
--- a/arch-pkg
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 27805c21d5beca3c79b3240ae1ab7403a98ec7ca
diff --git a/ch.tigerjython.TigerJython2.metainfo.xml b/ch.tigerjython.TigerJython2.metainfo.xml
index 1477082..00ef9d0 100644
--- a/ch.tigerjython.TigerJython2.metainfo.xml
+++ b/ch.tigerjython.TigerJython2.metainfo.xml
@@ -3,8 +3,11 @@
ch.tigerjython.TigerJython2
TigerJython
- TigerJython IDE
- TJ Group
+ Python IDE for schools
+ Python IDE für Schulen
+
+ TJ Group
+
FSFAP
BSD-3-Clause
@@ -17,20 +20,44 @@
TigerJython is a free development environment for the Python programming language. If you want to learn programming, this is the tool for you. It already includes everything you need to start programming right away.
-
- For all versions we guarantee not to change or spy your software.
+
+ TigerJython ist eine einfache Programmier-Umgebung für Python. Sie basiert auf Jython (Java-Python) und enthält bereits alle benötigten Bibliotheken.
ch.tigerjython.TigerJython2.desktop
-
+ https://tigerjython.ch/products/download
+
+ Version 2.40 [Sept-05-2024]
+
+ mbrobot and mbrobot_plusV2: Calibration of motors
+
+
+
+
+ https://tigerjython.ch/products/download
+
+ Version 2.39 [Jan-01-2024]
+
+ Module Callibot: Support for servomotors (Maqueen Mechanic)
+ Update of documentation
+
+
+
https://www.tigerjython.ch/
- https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/branch/main/screenshots/tigerjython_2_11.png
+ Main window with an example python file open.
+ https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/branch/main/screenshots/tigerjython_2_40.png
+ https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/branch/main/screenshots/tigerjython_2_40_de.png
-
+
+
+ #f37b1e
+ #040507
+
diff --git a/debian-deb/PKGBUILD b/debian-deb/PKGBUILD
deleted file mode 100644
index 525baea..0000000
--- a/debian-deb/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Beat Jäckle
-
-pkgname=tigerjython
-pkgver=2.37
-pkgrel=4
-pkgdesc='TigerJython IDE'
-arch=(x86_64)
-url='https://www.tigerjython.ch/'
-license=('custom')
-depends=(
- 'jre-openjdk>=2'
-)
-makedepends=('tar' 'gzip')
-
-# https://pixabay.com/de/vectors/fu%C3%9Fabdruck-tier-pelzig-pfote-308794/
-source=("https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz" 'http://jython.tobiaskohn.ch/images/TigerJython_Logo.png')
-b2sums=('32181780c1b1a86e7e151e01cf0428726f3c7ccd8c27db9d64cac4b03c1b8a0ae8e32fb029e9d32d3d1baf196f6874418d6a394e8b503bc454fdc367bbf2f01e'
- '4ae37420b11b7dd5e7ceb9c00fb48c6f575d6658b0cb0963e38155e79af5ba0cfaf1d00da8c278a6dcf5ae6615bf86b298dabca3c827fb7c80d1c55302a58dc7')
-_install_path=/opt
-
-prepare() {
- rm -fr "$pkgname-$pkgver"
- mv TigerJython/bin "$pkgname-$pkgver"
- mv TigerJython/Readme.txt "$pkgname-$pkgver"
- rm -r TigerJython
- cd "$pkgname-$pkgver"
- rm -r ./jre
- find -name ._\* -delete
- find -name .DS_Store -delete
-}
-
-build() {
- echo "#!/bin/sh" > "${srcdir}/tigerjython"
- echo "set -ue" >> "${srcdir}/tigerjython"
- echo "java -jar ${_install_path}/${pkgname}/tigerjython2.jar \$@" >> "${srcdir}/tigerjython"
-
- _desktopfile_path="${srcdir}/tigerjython.desktop"
- echo "[Desktop Entry]" > ${_desktopfile_path}
- echo "Name=${pkgdesc}" >> ${_desktopfile_path}
- echo "Exec=java -jar ${_install_path}/${pkgname}/tigerjython2.jar" >> ${_desktopfile_path}
- echo "Icon=tigerjython" >> ${_desktopfile_path}
- echo "Type=Application" >> ${_desktopfile_path}
- echo "Categories=Education;Science;Math;" >> ${_desktopfile_path}
- echo "Keywords=science;math;matrix;plotting;" >> ${_desktopfile_path}
-
-}
-
-package() {
-
- install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/Lib"
- install -Ddm755 "${pkgdir}/${_install_path}/${pkgname}/TestSamples"
-
- install -Dm644 "${srcdir}/$pkgname-$pkgver/tigerjython2"* "${pkgdir}/${_install_path}/${pkgname}/."
- install -Dm644 "${srcdir}/$pkgname-$pkgver/Lib/"* "${pkgdir}/${_install_path}/${pkgname}/Lib/."
- install -Dm644 "${srcdir}/$pkgname-$pkgver/TestSamples/"* "${pkgdir}/${_install_path}/${pkgname}/TestSamples/."
-
- install -Dm755 "${srcdir}/tigerjython" "${pkgdir}/usr/bin/tigerjython"
- install -Dm755 "${srcdir}/tigerjython.desktop" "${pkgdir}/usr/share/applications/tigerjython.desktop"
- install -Dm755 "${srcdir}/../tigerjython.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/tigerjython.svg"
-}
diff --git a/debian-deb/makedeb.sh b/debian-deb/makedeb.sh
deleted file mode 100755
index 1dab1f7..0000000
--- a/debian-deb/makedeb.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -ue
-# Src:
-# https://earthly.dev/blog/creating-and-hosting-your-own-deb-packages-and-apt-repo/
-
-. PKGBUILD
-
-srcdir="${PWD}/src"
-pkgdir="${PWD}/${pkgname}_${pkgver}-${pkgrel}_${arch}"
-rootdir="${PWD}"
-mkdir -p "${srcdir}"
-cd "${srcdir}"
-wget -c https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz
-# if ! [ -f TigerJython.tar.gz ];then wget https://www.tigerjython.ch/user/pages/download/TigerJython.tar.gz;fi
-tar -xf TigerJython.tar.gz
-prepare
-
-build
-
-mkdir -p "${pkgdir}"
-cd "${pkgdir}"
-package
-
-mkdir -p ${pkgdir}/DEBIAN
-echo "Package: ${pkgname}
-Version: ${pkgver}
-Maintainer: Beat Jäckle
-Depends: default-jre
-Architecture: amd64
-Homepage: ${url}
-Description: ${pkgdesc}" \
-> ${pkgdir}/DEBIAN/control
-fakeroot dpkg --build ${pkgdir}
diff --git a/debian-deb/tigerjython.svg b/debian-deb/tigerjython.svg
deleted file mode 100644
index 0586c1d..0000000
--- a/debian-deb/tigerjython.svg
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-
-
-
-
-
diff --git a/debian-deb/tigerjython_2.37-3_x86_64.deb b/debian-deb/tigerjython_2.37-3_x86_64.deb
deleted file mode 100644
index 33749d6..0000000
Binary files a/debian-deb/tigerjython_2.37-3_x86_64.deb and /dev/null differ
diff --git a/flatpak/Makefile b/flatpak/Makefile
deleted file mode 100644
index 983b275..0000000
--- a/flatpak/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-manifest = ch.tigerjython.TigerJython2.yml
-gpg = beat@git.jdmweb2.ch
-clean:
- flatpak uninstall --noninteractive ch.tigerjython.TigerJython2 > /dev/null || true
-
-build: clean
- flatpak-builder --install --user --force-clean build-dir ch.tigerjython.TigerJython2.yml
-run:
- flatpak run --nosocket=fallback-x11 --socket=x11 ch.tigerjython.TigerJython2
-sh:
- flatpak run --command=sh ch.tigerjython.TigerJython2
-
-#https://docs.flathub.org/docs/for-app-authors/submission/
-sub_build: clean
- # flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ch.tigerjython.TigerJython2.yml
- # flatpak run org.flatpak.Builder --force-clean --sandbox --user --install --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ch.tigerjython.TigerJython2.yml
- # flatpak --user install -y --noninteractive flathub org.freedesktop.Sdk/x86_64/23.08
- flatpak-builder --gpg-sign=beat@git.jdmweb2.ch --force-clean --sandbox --user --install --install-deps-from=flathub --ccache --mirror-screenshots-url=https://dl.flathub.org/repo/screenshots --repo=repo builddir ${manifest}
-sub_lint:
- flatpak run --command=flatpak-builder-lint org.flatpak.Builder manifest ${manifest}
-sub_metainfo:
- flatpak run --command=appstream-util org.flatpak.Builder validate ch.tigerjython.TigerJython2.metainfo.xml
diff --git a/flatpak/TigerJython.tar.gz b/flatpak/TigerJython.tar.gz
deleted file mode 120000
index eec46ac..0000000
--- a/flatpak/TigerJython.tar.gz
+++ /dev/null
@@ -1 +0,0 @@
-../TigerJython.tar.gz
\ No newline at end of file
diff --git a/flatpak/ch.tigerjython.TigerJython2.yml b/flatpak/ch.tigerjython.TigerJython2.yml
deleted file mode 100644
index 5cad3bc..0000000
--- a/flatpak/ch.tigerjython.TigerJython2.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-id: ch.tigerjython.TigerJython2
-runtime: org.freedesktop.Platform
-runtime-version: '23.08'
-sdk: org.freedesktop.Sdk
-sdk-extensions:
- - org.freedesktop.Sdk.Extension.openjdk
-finish-args:
- - --env=PATH=/app/jre/bin:/app/bin:/usr/bin
- # X11 + XShm access
- - --share=ipc
- # - --socket=fallback-x11
- # Wayland access
- - --socket=x11
- # GPU acceleration if needed
- - --device=dri
- # Needs to talk to the network:
- - --share=network
- # Needs to save files locally
- - --filesystem=xdg-documents
-command: tigerjython
-modules:
- - name: openjdk
- buildsystem: simple
- build-commands:
- - /usr/lib/sdk/openjdk/install.sh
- - name: tigerjython2
- buildsystem: simple
- build-commands:
- - sed -i "s|/usr/bin/java|/app/jre/bin/java|g" tigerjython
- - sed -i "s|/opt/tigerjython|/app/tigerjython|g" tigerjython
- - install -Dm644 Lib/* -t /app/tigerjython/Lib
- - install -Dm644 TestSamples/* -t /app/tigerjython/TestSamples
- - install -m755 tigerjython2.jar /app/tigerjython/tigerjython2.jar
- - install -Dm755 tigerjython -t /app/bin
- - desktop-file-edit --set-icon=ch.tigerjython.TigerJython2 --set-key=Exec --set-value="tigerjython %f" tigerjython.desktop
- sources:
- - type: archive
- url: https://git.jdmweb2.ch/beat/tigerjython_pkg/raw/tag/V2.39/TigerJython.tar.gz
- sha256: 5961b11112ad27d4831d47d3422baa41d1ba8059e8dde3db2e4c4a8759aad607
diff --git a/screenshots/tigerjython_2_40.png b/screenshots/tigerjython_2_40.png
new file mode 100644
index 0000000..219d81f
Binary files /dev/null and b/screenshots/tigerjython_2_40.png differ
diff --git a/screenshots/tigerjython_2_40_de.png b/screenshots/tigerjython_2_40_de.png
new file mode 100644
index 0000000..9072840
Binary files /dev/null and b/screenshots/tigerjython_2_40_de.png differ
diff --git a/tigerjython.svg b/tigerjython.svg
index 6a401f8..b3dcc44 100644
--- a/tigerjython.svg
+++ b/tigerjython.svg
@@ -1,114 +1,103 @@
+
+
-
-
-
-
-
+ inkscape:current-layer="layer1"
+ showguides="true" />