Changeset 154 for tags/1.4.0/Install

Timestamp:

Jan 14, 2025, 12:35:35 PM (7 months ago)

Author:

chronos

Message:

Merged revision(s) 152-153 from trunk:

• Modified: Improved flatpak packaging.
• Fixed: Detection of languages directory on Linux.
• Fixed: Top left menu alignment.
• Modified: Improved debian control script.

Location:

tags/1.4.0

Files:

• . (modified) (1 prop)
• Install/deb/TransLines.desktop (modified) (1 diff)
• Install/deb/debian/rules (modified) (1 diff)
• Install/flatpak/build.sh (modified) (1 diff)
• Install/flatpak/net.zdechov.app.TransLines.appdata.xml (deleted)
• Install/flatpak/net.zdechov.app.TransLines.desktop (deleted)
• Install/flatpak/net.zdechov.app.TransLines.metainfo.xml (copied) (copied from trunk/Install/flatpak/net.zdechov.app.TransLines.metainfo.xml )
• Install/flatpak/net.zdechov.app.TransLines.yml (modified) (3 diffs)

tags/1.4.0/Install/deb/TransLines.desktop

@@ -7 +7 @@
 Terminal=false
 Type=Application
-Categories=GNOME;Application;Game;
+Categories=Game;Simulation
 StartupNotify=true
+Keywords=metro;subway;transport;map;transit;simulation;passengers

tags/1.4.0/Install/deb/debian/rules

@@ -14 +14 @@
 
 override_dh_auto_install:
-        install -d -m 755 $(ROOT)/usr/bin
-        install -s -m 755 TransLines $(ROOT)/usr/bin
-        install -d -m 755 $(ROOT)/usr/share/applications
-        install -m 755 Install/deb/TransLines.desktop $(ROOT)/usr/share/applications
-        install -d -m 755 $(ROOT)/usr/share/pixmaps
-        install -m 644 Images/64x64/TransLines.png $(ROOT)/usr/share/pixmaps
-        install -d -m 755 $(ROOT)/usr/share/TransLines/languages
-        install -m 755 Languages/*.pot $(ROOT)/usr/share/TransLines/languages
-        install -m 755 Languages/*.po $(ROOT)/usr/share/TransLines/languages
+        install -Dm755 TransLines -t $(ROOT)/usr/bin
+        install -Dm644 Install/deb/TransLines.desktop -t $(ROOT)/usr/share/applications
+        install -Dm644 Images/64x64/TransLines.png -t $(ROOT)/usr/share/pixmaps
+        install -Dm644 Languages/*.po -t $(ROOT)/usr/share/TransLines/Languages
+        install -Dm644 Packages/Common/Languages/*.po -t $(ROOT)/usr/share/TransLines/Languages
 
 %:

tags/1.4.0/Install/flatpak/build.sh

@@ -7 +7 @@
 
 # Install dependencies
-flatpak install --system flathub org.kde.Sdk//5.15-23.08
-flatpak install --system flathub org.kde.Platform//5.15-23.08
-flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//23.08
+flatpak install --system flathub org.kde.Sdk//5.15-24.08
+flatpak install --system flathub org.kde.Platform//5.15-24.08
+flatpak install --system flathub org.freedesktop.Sdk.Extension.freepascal//24.08
 flatpak install --system flathub org.flatpak.Builder
 

tags/1.4.0/Install/flatpak/net.zdechov.app.TransLines.yml

@@ -1 +1 @@
 app-id: net.zdechov.app.TransLines
 runtime: org.kde.Platform
-runtime-version: '5.15-23.08'
+runtime-version: '5.15-24.08'
 sdk: org.kde.Sdk
 sdk-extensions:
   - org.freedesktop.Sdk.Extension.freepascal
 command: TransLines
+rename-icon: TransLines
+rename-desktop-file: TransLines.desktop
 finish-args:
   - --share=ipc
@@ -26 +28 @@
       - type: svn
         url: https://svn.zdechov.net/translines/tags/1.4.0
-        revision: r149
+        revision: r154
     buildsystem: simple
     build-commands:
@@ -32 +34 @@
         . /usr/lib/sdk/freepascal/enable.sh
         lazbuild --build-mode=Release --ws=qt5 TransLines.lpi
-      - install -Dm755 TransLines -t $FLATPAK_DEST/share/TransLines
-      - install -d $FLATPAK_DEST/bin
-      - ln -s $FLATPAK_DEST/share/TransLines/TransLines $FLATPAK_DEST/bin/TransLines
-      - install -Dm644 Install/flatpak/${FLATPAK_ID}.desktop -t $FLATPAK_DEST/share/applications
-      - install -Dm644 Images/256x256/TransLines.png $FLATPAK_DEST/share/icons/hicolor/256x256/apps/${FLATPAK_ID}.png
+      - install -Dm755 TransLines -t $FLATPAK_DEST/bin
+      - install -Dm644 Install/deb/TransLines.desktop -t $FLATPAK_DEST/share/applications
+      - install -Dm644 Images/256x256/TransLines.png -t $FLATPAK_DEST/share/icons/hicolor/256x256/apps
       - install -Dm644 Languages/*.po -t $FLATPAK_DEST/share/TransLines/Languages
-      - install -Dm644 Install/flatpak/${FLATPAK_ID}.appdata.xml $FLATPAK_DEST/share/metainfo/${FLATPAK_ID}.metainfo.xml
+      - install -Dm644 Packages/Common/Languages/*.po -t $FLATPAK_DEST/share/TransLines/Languages
+      - install -Dm644 Install/flatpak/${FLATPAK_ID}.metainfo.xml -t $FLATPAK_DEST/share/metainfo