From dfbfa3c2c8729f5fa26ce121cf316bb2f369e8e8 Mon Sep 17 00:00:00 2001
From: Vladimir Burdukov <me@chipp.dev>
Date: Tue, 26 May 2026 17:33:20 +0300
Subject: [PATCH] Fixed conflict with KDE's elisa

---
 .github/workflows/deploy.yml |  6 +++---
 .github/workflows/pr.yml     | 14 +++++++++++---
 scripts/package_deb.sh       | 15 +++++++++++++--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index bc823b9..8d48b59 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -95,15 +95,15 @@ jobs:
             build/${{ matrix.binary }} \
             build
 
-          dpkg-deb --info build/${{ matrix.binary }}_0.1.${{ github.run_number }}_arm64.deb
-          dpkg-deb --contents build/${{ matrix.binary }}_0.1.${{ github.run_number }}_arm64.deb
+          dpkg-deb --info build/lisa-${{ matrix.binary }}_0.1.${{ github.run_number }}_arm64.deb
+          dpkg-deb --contents build/lisa-${{ matrix.binary }}_0.1.${{ github.run_number }}_arm64.deb
 
       - name: Archive arm64 deb artifact
         if: matrix.mode == 'binary'
         uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02
         with:
           name: ${{ matrix.binary }}
-          path: build/${{ matrix.binary }}_*.deb
+          path: build/lisa-${{ matrix.binary }}_*.deb
           retention-days: 1
 
   deploy:
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1c9a4fa..38611d3 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -88,12 +88,12 @@ jobs:
 
       - name: Verify deb package contents
         run: |
-          package=build/${{ matrix.binary }}_0.1.0_arm64.deb
+          package=build/lisa-${{ matrix.binary }}_0.1.0_arm64.deb
 
           dpkg-deb --info "$package"
           dpkg-deb --contents "$package"
 
-          dpkg-deb --field "$package" Package | grep -Fx ${{ matrix.binary }}
+          dpkg-deb --field "$package" Package | grep -Fx lisa-${{ matrix.binary }}
           dpkg-deb --field "$package" Version | grep -Fx 0.1.0
           dpkg-deb --field "$package" Architecture | grep -Fx arm64
           dpkg-deb --contents "$package" | grep -F ./usr/bin/${{ matrix.binary }}
@@ -115,10 +115,18 @@ jobs:
              target/deb-check/${{ matrix.binary }} \
              build
 
-          package=build/${{ matrix.binary }}_0.1.0_amd64.deb
+          package=build/lisa-${{ matrix.binary }}_0.1.0_amd64.deb
 
           dpkg-deb --field "$package" Architecture | grep -Fx amd64
 
+      - name: Verify distro package replacement
+        if: matrix.binary == 'elisa'
+        run: |
+          package=build/lisa-${{ matrix.binary }}_0.1.0_arm64.deb
+
+          dpkg-deb --field "$package" Conflicts | grep -Fx elisa
+          dpkg-deb --field "$package" Replaces | grep -Fx elisa
+
   test:
     runs-on: ubuntu-24.04-arm
     needs: [fmt, clippy, deny]
diff --git a/scripts/package_deb.sh b/scripts/package_deb.sh
index ba7a8be..56578ec 100755
--- a/scripts/package_deb.sh
+++ b/scripts/package_deb.sh
@@ -11,6 +11,7 @@ version="$2"
 binary_path="$3"
 output_dir="$4"
 arch="${ARCH:-arm64}"
+package_name="lisa-$service"
 
 case "$service" in
   elisa|elisheba|isabel) ;;
@@ -44,13 +45,23 @@ install -d \
 installed_size="$(du -k "$binary_path" | awk '{ print $1 }')"
 
 cat > "$package_root/DEBIAN/control" <<EOF
-Package: $service
+Package: $package_name
 Version: $version
 Section: utils
 Priority: optional
 Architecture: $arch
 Maintainer: chipp
 Depends: $depends
+EOF
+
+if [ "$service" = "elisa" ]; then
+  cat >> "$package_root/DEBIAN/control" <<EOF
+Conflicts: elisa
+Replaces: elisa
+EOF
+fi
+
+cat >> "$package_root/DEBIAN/control" <<EOF
 Installed-Size: $installed_size
 Description: Lisa $service service
 EOF
@@ -117,4 +128,4 @@ install -m 644 "$repo_dir/packaging/deb/env/$service.env.example" \
 
 install -d "$output_dir"
 dpkg-deb --build --root-owner-group "$package_root" \
-  "$output_dir/${service}_${version}_${arch}.deb"
+  "$output_dir/${package_name}_${version}_${arch}.deb"