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

Merge branch 'develop' into feature/mount-provider

Browse Source 
# Conflicts:
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
This commit is contained in:
Armin Schrenk
2023-01-11 16:01:27 +01:00
parent 6fe2d73c52 304064d9ab
commit 24d472ed8b
16 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/linux/appimage/build.sh
Vendored
+1 -3
View File
@@ -38,9 +38,7 @@ ${JAVA_HOME}/bin/jpackage \
--dest . \
--name Cryptomator \
--vendor "Skymatic GmbH" \
--copyright "(C) 2016 - 2022 Skymatic GmbH" \
--java-options "--enable-preview" \
--java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \
--copyright "(C) 2016 - 2023 Skymatic GmbH" \
--java-options "-Xss5m" \
--java-options "-Xmx256m" \
--app-version "${VERSION}.${REVISION_NO}" \
dist/linux/debian/copyright
Vendored
+2 -2
View File
@@ -4,11 +4,11 @@ Upstream-Contact: Cryptomator <info@cryptomator.org>
Source: https://cryptomator.org
Files: *
Copyright: 2016-2022 Skymatic GmbH
Copyright: 2016-2023 Skymatic GmbH
License: GPL-3+
Files: debian/org.cryptomator.Cryptomator.appdata.xml
Copyright: 2016-2022 Skymatic GmbH
Copyright: 2016-2023 Skymatic GmbH
License: FSFAP
License: GPL-3+
dist/linux/debian/rules
Vendored
+1 -3
View File
@@ -42,9 +42,7 @@ override_dh_auto_build:
--dest . \
--name cryptomator \
--vendor "Skymatic GmbH" \
--copyright "(C) 2016 - 2022 Skymatic GmbH" \
--java-options "--enable-preview" \
--java-options "--enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64" \
--copyright "(C) 2016 - 2023 Skymatic GmbH" \
--java-options "-Xss5m" \
--java-options "-Xmx256m" \
--java-options "-Dfile.encoding=\"utf-8\"" \