Skip to content

Commit 2da36fa

Browse files
committed
Merge remote-tracking branch 'origin/dev'
2 parents 55e07ec + f59f35f commit 2da36fa

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1026
-276
lines changed

.github/assets/omodscan-log.png

165 KB
Loading

.github/assets/omodscan-main.png

93.4 KB
Loading
78.1 KB
Loading

.github/linux/deb/control.in

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,13 @@ Source: @PACKAGE_SOURCE@
22
Section: utils
33
Priority: optional
44
Maintainer: Alexandr Ananev <mail@ananev.org>
5+
Homepage: https://github.com/sanny32/OpenModScan
56
Build-Depends: debhelper-compat (= 12)
67
Standards-Version: 4.6.2
78

89
Package: @PACKAGE_NAME@
910
Architecture: amd64
1011
Depends: ${shlibs:Depends}, ${misc:Depends}
11-
Description: An Open Source Modbus Master (Client) Utility.
12+
Description: An Open Source Modbus Master (Client) Utility
13+
Open ModScan is an open source Modbus master (client) utility for testing and debugging Modbus TCP and RTU devices.
14+

.github/linux/deb/dirs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ usr/share/icons/hicolor/16x16/apps
44
usr/share/icons/hicolor/32x32/apps
55
usr/share/icons/hicolor/64x64/apps
66
usr/share/icons/hicolor/128x128/apps
7+
usr/share/metainfo
78

.github/linux/deb/install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ usr/share/icons/hicolor/16x16/apps
44
usr/share/icons/hicolor/32x32/apps
55
usr/share/icons/hicolor/64x64/apps
66
usr/share/icons/hicolor/128x128/apps
7+
usr/share/metainfo

.github/linux/flatpak/io.github.sanny32.omodscan.desktop

Lines changed: 0 additions & 9 deletions
This file was deleted.

.github/linux/flatpak/io.github.sanny32.omodscan.metainfo.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.
-671 Bytes
Binary file not shown.

.github/linux/flatpak/io.github.sanny32.omodscan.yaml

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,39 @@ modules:
4949
builddir: true
5050
buildsystem: simple
5151
build-commands:
52-
- cmake -DCMAKE_BUILD_TYPE=Release -B ../build
53-
- cmake --build ../build -- -j$(nproc)
52+
- cmake -DCMAKE_BUILD_TYPE=Release -B ../build
53+
- cmake --build ../build -- -j$(nproc)
54+
5455
post-install:
5556
- install -D ../build/omodscan /app/bin/omodscan
56-
- install -Dm644 ../io.github.sanny32.omodscan.png -t /app/share/icons/hicolor/128x128/apps
57-
- install -Dm644 ../io.github.sanny32.omodscan.desktop -t /app/share/applications
58-
- install -Dm644 ../io.github.sanny32.omodscan.metainfo.xml -t /app/share/metainfo
57+
58+
- install -Dm644 ../omodscan-128x128.png /app/share/icons/hicolor/128x128/apps/io.github.sanny32.omodscan.png
59+
- install -Dm644 ../omodscan-64x64.png /app/share/icons/hicolor/64x64/apps/io.github.sanny32.omodscan.png
60+
- install -Dm644 ../omodscan-32x32.png /app/share/icons/hicolor/32x32/apps/io.github.sanny32.omodscan.png
61+
- install -Dm644 ../omodscan-16x16.png /app/share/icons/hicolor/16x16/apps/io.github.sanny32.omodscan.png
62+
63+
- install -Dm644 ../omodscan.desktop /app/share/applications/io.github.sanny32.omodscan.desktop
64+
- install -Dm644 ../omodscan.metainfo.xml /app/share/metainfo/io.github.sanny32.omodscan.metainfo.xml
5965
subdir: src
6066
sources:
6167
- type: git
6268
url: https://github.com/sanny32/OpenModScan.git
63-
branch: main
69+
branch: dev
70+
- type: file
71+
path: ../usr/share/icons/hicolor/128x128/apps/omodscan.png
72+
dest-filename: omodscan-128x128.png
73+
- type: file
74+
path: ../usr/share/icons/hicolor/64x64/apps/omodscan.png
75+
dest-filename: omodscan-64x64.png
76+
- type: file
77+
path: ../usr/share/icons/hicolor/32x32/apps/omodscan.png
78+
dest-filename: omodscan-32x32.png
6479
- type: file
65-
path: io.github.sanny32.omodscan.png
80+
path: ../usr/share/icons/hicolor/16x16/apps/omodscan.png
81+
dest-filename: omodscan-16x16.png
6682
- type: file
67-
path: io.github.sanny32.omodscan.desktop
83+
path: ../usr/share/applications/omodscan.desktop
84+
dest-filename: omodscan.desktop
6885
- type: file
69-
path: io.github.sanny32.omodscan.metainfo.xml
86+
path: ../usr/share/metainfo/omodscan.metainfo.xml
87+
dest-filename: omodscan.metainfo.xml

0 commit comments

Comments
 (0)