From 891b5597de0d37cbeede2c1797cfd5f9c185eebb Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastian.stenzel@gmail.com>
Date: Thu, 24 Feb 2022 16:29:21 +0100
Subject: [PATCH] fix build, add common/ to debian orig.tar.xz

---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 55e871ad7..f6870c974 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -216,15 +216,16 @@ jobs:
         with:
           name: linux-buildkit
           path: pkgdir
-      - name: create orig.tar.gz
-        run: tar -cJf cryptomator_${{ needs.metadata.outputs.ppaVerStr }}.orig.tar.xz -C pkgdir .
+      - name: create orig.tar.gz with common/ libs/ mods/
+        run: |
+          cp -r dist/linux/common/ pkgdir
+          envsubst '${SEMVER_STR}' < dist/linux/common/org.cryptomator.Cryptomator.desktop > pkgdir/common/org.cryptomator.Cryptomator.desktop
+          tar -cJf cryptomator_${{ needs.metadata.outputs.ppaVerStr }}.orig.tar.xz -C pkgdir .
       - name: patch and rename pkgdir
         run: |
           cp -r dist/linux/debian/ pkgdir
-          cp -r dist/linux/common/ pkgdir
           export RFC2822_TIMESTAMP=`date --rfc-2822`
           envsubst '${SEMVER_STR} ${VERSION_NUM} ${REVISION_NUM}' < dist/linux/debian/rules > pkgdir/debian/rules
-          envsubst '${SEMVER_STR}' < dist/linux/common/org.cryptomator.Cryptomator.desktop > pkgdir/common/org.cryptomator.Cryptomator.desktop
           envsubst '${PPA_VERSION} ${RFC2822_TIMESTAMP}' < dist/linux/debian/changelog > pkgdir/debian/changelog
           find . -name "*.jar" >> pkgdir/debian/source/include-binaries
           mv pkgdir cryptomator_${{ needs.metadata.outputs.ppaVerStr }}
@@ -286,7 +287,6 @@ jobs:
           cp dist/linux/common/org.cryptomator.Cryptomator256.png Cryptomator.AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png
           cp dist/linux/common/org.cryptomator.Cryptomator512.png Cryptomator.AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png
           cp dist/linux/common/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg
-          cp dist/linux/common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop
           cp dist/linux/common/org.cryptomator.Cryptomator.appdata.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml
           cp dist/linux/common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml
           ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg