From 769ad22ea677108a8d41370c0285a85c9f79d803 Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Tue, 17 Sep 2024 21:44:23 +0200 Subject: [PATCH] Cleaning up and update Linux data + Removing (no longer working) local install for linux. + Moving appstream changelog generation to scripts. + Updating debian package information. --- linux/debian/control | 6 ++-- linux/debian/copyright | 2 +- linux/debian/depends | 2 +- linux/install_local.sh | 36 ------------------- .../generate-appstream-changelog.sh | 0 scripts/package-linux.sh | 2 +- 6 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 linux/install_local.sh rename {linux => scripts}/generate-appstream-changelog.sh (100%) diff --git a/linux/debian/control b/linux/debian/control index 15e0846..57281bc 100644 --- a/linux/debian/control +++ b/linux/debian/control @@ -1,11 +1,11 @@ Package: logarithmplotter Source: logarithmplotter -Version: 0.5.0 +Version: 0.6.0 Architecture: all Maintainer: Ad5001 -Depends: python3, python3-pip, python3-pyside6-essentials (>= 6.4.0), texlive-latex-base, dvipng +Depends: python3, python3-pip, python3-pyside6-essentials (>= 6.7.0), texlive-latex-base, dvipng -Build-Depends: debhelper (>=11~), dh-python, dpkg-dev (>= 1.16.1~), python-setuptools, python3-all-dev (>=3.6) +Build-Depends: debhelper (>=11~), dh-python, dpkg-dev (>= 1.16.1~), python-setuptools, python3-all-dev (>=3.9) Section: science Priority: optional Homepage: https://apps.ad5001.eu/logarithmplotter/ diff --git a/linux/debian/copyright b/linux/debian/copyright index 6d05e77..138dae9 100644 --- a/linux/debian/copyright +++ b/linux/debian/copyright @@ -3,6 +3,6 @@ Upstream-Name: logarithmplotter Upstream-Contact: Ad5001 Files: * -Copyright: 2023, Ad5001 +Copyright: 2024, Ad5001 License: GPL-3.0+ diff --git a/linux/debian/depends b/linux/debian/depends index fb79d69..5eea4fd 100644 --- a/linux/debian/depends +++ b/linux/debian/depends @@ -1 +1 @@ -python3, python3-pip, python3-pyside6-essentials (>= 6.4.0), texlive-latex-base, dvipng +python3, python3-pip, python3-pyside6-essentials (>= 6.7.0), texlive-latex-base, dvipng diff --git a/linux/install_local.sh b/linux/install_local.sh deleted file mode 100644 index 714cc0b..0000000 --- a/linux/install_local.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash -# -# AccountFree - Browse and use online services, free of account. -# Copyright (C) 2022 Ad5001 -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# -# This script installs the desktop file & mime type for development environment, linking it directly to run.py. - -APPROOT="$(cd -P "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)" -echo "Adding desktop file..." -sed "s+ROOTFOLDER+$APPROOT/+g" "$APPROOT/linux/logplotter.desktop" > "$APPROOT/linux/logarithmplotter-local.desktop" -xdg-desktop-menu install "$APPROOT/linux/logarithmplotter-local.desktop" -echo "Installing mime-type..." -xdg-mime install "$APPROOT/linux/x-logarithm-plot.xml" -echo "Installing icons..." -mkdir -p ~/.local/share/icons/hicolor/scalable/mimetypes -cp "$APPROOT/linux/application-x-logarithm-plot.svg" ~/.local/share/icons/hicolor/scalable/mimetypes/application-x-logarithm-plot.svg -mkdir -p ~/.local/share/icons/hicolor/scalable/apps -cp "$APPROOT/logplotter.svg" ~/.local/share/icons/hicolor/scalable/apps/logarithmplotter.svg -# xdg-icon-resource does not work with SVG yet. See https://bugs.launchpad.net/ubuntu/+source/xdg-utils/+bug/790449. -#xdg-icon-resource install --context mimetypes --novendor "$APPROOT/linux/application-x-logarithm-plot.svg" "application-x-logarithm-plot" -#xdg-icon-resource install --context apps --novendor "$APPROOT/logplotter.svg" "logarithmplotter" -update-mime-database ~/.local/share/mime/ -update-icon-caches ~/.local/share/icons/hicolor diff --git a/linux/generate-appstream-changelog.sh b/scripts/generate-appstream-changelog.sh similarity index 100% rename from linux/generate-appstream-changelog.sh rename to scripts/generate-appstream-changelog.sh diff --git a/scripts/package-linux.sh b/scripts/package-linux.sh index af79276..ca2bcf7 100755 --- a/scripts/package-linux.sh +++ b/scripts/package-linux.sh @@ -8,7 +8,7 @@ cd ../../ # Deb sudo python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ - --package logarithmplotter --copyright-file linux/debian/copyright --suite jammy --depends3 "$(cat linux/debian/depends)" --section science \ + --package logarithmplotter --copyright-file linux/debian/copyright --suite noble --depends3 "$(cat linux/debian/depends)" --section science \ bdist_deb # Flatpak building