mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-10-01 04:06:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/jdk21

Browse Source 
# Conflicts:
#	pom.xml
This commit is contained in:
Sebastian Stenzel
2023-09-25 12:15:14 +02:00
parent c10dc74818 92d9f2c18d
commit e1d7fd92ad
15 changed files with 82 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
Vendored
+1
View File
@@ -66,6 +66,7 @@
</content_rating>
<releases>
<release date="2023-09-20" version="1.10.1"/>
<release date="2023-09-11" version="1.10.0"/>
<release date="2023-08-11" version="1.9.4"/>
<release date="2023-08-07" version="1.9.3"/>
dist/linux/debian/rules
Vendored
+1
View File
@@ -59,6 +59,7 @@ override_dh_auto_build:
--java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"/usr/share/icons/hicolor/symbolic/apps\"" \
--java-options "-Dcryptomator.buildNumber=\"deb-${REVISION_NUM}\"" \
--java-options "-Dcryptomator.appVersion=\"${SEMVER_STR}\"" \
--java-options "-Dcryptomator.disableUpdateCheck=\"${DISABLE_UPDATE_CHECK}\"" \
--app-version "${VERSION_NUM}.${REVISION_NUM}" \
--resource-dir resources \
--verbose