Merge remote-tracking branch 'origin/auth-linux-fixes' into auth-linux-fixes

.github/workflows/auth-release.yml

@@ -96,7 +96,8 @@ jobs:
             - name: Build desktop app
               run: |
                   flutter config --enable-linux-desktop
-                  dart pub global activate flutter_distributor
+                  # dart pub global activate flutter_distributor
+                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
                   flutter_distributor package --platform=linux --targets=deb --skip-clean
                   mv dist/**/*-*-linux.deb artifacts/ente-${{ github.ref_name }}-x86_64.deb
               env:
@@ -163,7 +164,7 @@ jobs:
           run: |
             flutter config --enable-linux-desktop
             # dart pub global activate flutter_distributor
-            dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref pacman --git-path packages/flutter_distributor
+            dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
             # Run below command if it is a beta or nightly
             if [[ ${{ github.ref }} =~ beta|nightly ]]; then
               flutter_distributor package --platform=linux --targets=pacman --skip-clean
@@ -211,7 +212,8 @@ jobs:
             - name: Build Windows installer
               run: |
                   flutter config --enable-windows-desktop
-                  dart pub global activate flutter_distributor
+                  # dart pub global activate flutter_distributor
+                  dart pub global activate --source git https://github.com/prateekmedia/flutter_distributor --git-ref develop --git-path packages/flutter_distributor
                   make innoinstall
                   flutter_distributor package --platform=windows --targets=exe --skip-clean
                   mv dist/**/ente_auth-*-windows-setup.exe artifacts/ente-${{ github.ref_name }}-installer.exe

auth/linux/packaging/appimage/make_config.yaml

@@ -1,4 +1,5 @@
 display_name: Ente Auth
+package_name: enteauth
 license: GPLv3
 
 metainfo: linux/packaging/ente_auth.appdata.xml
@@ -26,9 +27,9 @@ startup_notify: false
 # include:
 #   - libcurl.so.4
 include:
-    - libffi.so.8
-    - libtiff.so.5
-    - libjpeg.so.8
+  - libffi.so.8
+  - libtiff.so.5
+  - libjpeg.so.8
 
 supported_mime_type:
-  - x-scheme-handler/enteauth
+  - x-scheme-handler/enteauth

auth/linux/packaging/deb/make_config.yaml

@@ -1,5 +1,7 @@
 display_name: Ente Auth
 package_name: enteauth
+include_build_number: false
+
 maintainer:
   name: Ente.io Developers
   email: auth@ente.io

auth/linux/packaging/rpm/make_config.yaml

@@ -6,6 +6,7 @@ packager: Ente.io Developers
 packagerEmail: auth@ente.io
 license: GPLv3
 url: https://github.com/ente-io/ente
+package_name: enteauth
 
 display_name: Auth
 

auth/windows/packaging/exe/make_config.yaml

@@ -1,4 +1,5 @@
 app_id: 9E5F0C93-96A3-4DA9-AE52-1AA6339851FC
+package_name: enteauth
 publisher: ente.io
 publisher_url: https://github.com/ente-io/ente
 display_name: Ente Auth