From 10a1f345425b378ee8dd72b07ccfa2941fd1dbcf Mon Sep 17 00:00:00 2001
From: Aravinda Vishwanathapura <aravinda@kadalu.tech>
Date: Thu, 4 Aug 2022 17:02:17 +0530
Subject: [PATCH] Fix Deb build issues and remove GH action to build packages
 (#225)

Signed-off-by: Aravinda Vishwanathapura <aravinda@kadalu.tech>
---
 .github/workflows/on-release-tag.yml | 35 ----------------------------
 packaging/glusterfs/debian/control   |  7 +++---
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/on-release-tag.yml b/.github/workflows/on-release-tag.yml
index 1b69824..f41cd54 100644
--- a/.github/workflows/on-release-tag.yml
+++ b/.github/workflows/on-release-tag.yml
@@ -87,38 +87,3 @@ jobs:
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true
-
-  build_deb_files:
-    runs-on: ubuntu-22.04
-    steps:
-      - uses: actions/checkout@v1
-      # TODO: Review the below list of dependencies
-      - name: Install the Build dependencies
-        run: |
-          sudo apt update -y
-          sudo apt install -y --no-install-recommends python3 libtirpc3 init     \
-          python3-pip ssh rsync lvm2 less software-properties-common             \
-          sudo curl wget git build-essential automake autoconf automake libtool  \
-          flex bison libssl-dev pkg-config uuid-dev acl-dev zlib1g-dev           \
-          libxml2-dev libxml2-utils liburcu-dev xfsprogs gdb attr                \
-          libgoogle-perftools-dev zfsutils-linux screen libsqlite3-dev sqlite3   \
-          debmake python3-debian debhelper dh-python                             \
-          libaio-dev libdb-dev libfuse-dev libibverbs-dev liblvm2-dev            \
-          libncurses5-dev librdmacm-dev libreadline-dev python3-all-dev
-      - name: Install Crystal
-        run: |
-          curl -fsSL https://crystal-lang.org/install.sh | sudo bash
-      - name: Build Debian packages
-        run: |
-          PACKAGING_GPG_SIGNING_KEY="${{ secrets.PACKAGING_GPG_SIGNING_KEY }}" VERSION="${{ github.ref_name }}" ./generate_deb_packages.sh
-      - name: Check built packages
-        run: |
-          ls -lh build/
-      - name: Upload deb packages and meta files to the release
-        uses: svenstaro/upload-release-action@v2
-        with:
-          repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: build/*
-          tag: ${{ github.ref }}
-          overwrite: true
-          file_glob: true
diff --git a/packaging/glusterfs/debian/control b/packaging/glusterfs/debian/control
index fb30b7d..31e91d4 100644
--- a/packaging/glusterfs/debian/control
+++ b/packaging/glusterfs/debian/control
@@ -38,6 +38,7 @@ Depends: ${misc:Depends},
  fuse,
  kadalu-storage-common (>= ${binary:Version}),
 Conflicts: glusterfs-client
+Replaces: kadalu-storage-client
 Description: clustered file-system (client package)
  This package provides the FUSE based Kadalu-Storage/GlusterFS tool.
 
@@ -52,6 +53,7 @@ Depends: ${misc:Depends},
  kadalu-storage-client (>= ${binary:Version}),
  libgoogle-perftools-dev
 Conflicts: glusterfs-server
+Replaces: kadalu-storage-server
 Description: clustered file-system (server package)
  This package installs init scripts and configuration files to turn
  Kadalu-Storage/GlusterFS into a fully fledged file server.
@@ -73,10 +75,7 @@ Depends: ${misc:Depends},
  python3-jwt, kadalu-storage-manager
 Conflicts: libglusterfs0,
  libglusterfs-dev, glusterfs-common
-Breaks: kadalu-storage-server
-Replaces: kadalu-storage-server,
- libglusterfs0,
- libglusterfs-dev
+Replaces: kadalu-storage-common
 Description: Kadalu-Storage common libraries and translator modules
  This package includes libglusterfs and glusterfs translator modules
  common to both Kadalu-Storage server and client framework, as well as