fix #2269: build: adapt to glusterfs changes

build-depend on Buster's re-introduced libglusterfs-dev, and depend on
either libglusterfs0 / libgfFOO (Debian repos) or glusterfs-common
(upstream community repos), until the latter gets fixed upstream.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/debian/control b/debian/control
index 188f8afc464cbebaa011b42e7f34a15a03df7939..2609f1c6be596eeaaac3e00274b71af4ebc01aa4 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,12 @@ Maintainer: Proxmox Support Team <support@proxmox.com>
 Build-Depends: autotools-dev,
                check,
                debhelper (>= 9),
-               glusterfs-common (>= 3.5.2-1),
                libacl1-dev,
                libaio-dev,
                libcap-dev,
                libcurl4-gnutls-dev,
                libfdt-dev,
+               libglusterfs-dev (>= 5.2-2),
                libgnutls28-dev,
                libiscsi-dev (>= 1.12.0),
                libjemalloc-dev,
@@ -36,9 +36,15 @@ Standards-Version: 3.7.2
 Package: pve-qemu-kvm
 Architecture: any
 Depends: ceph-common (>= 0.48),
-         glusterfs-common (>= 3.5.2-1),
          iproute2,
          libaio1,
+         libgfapi0 | glusterfs-common (>= 5.6),
+         libgfchangelog0 | glusterfs-common (>= 5.6),
+         libgfdb0 | glusterfs-common (>= 5.6),
+         libgfrpc0 | glusterfs-common (>= 5.6),
+         libgfxdr0 | glusterfs-common (>= 5.6),
+         libglusterfs-dev | glusterfs-common (>= 5.6),
+         libglusterfs0 | glusterfs-common (>= 5.6),
          libiscsi4 (>= 1.12.0) | libiscsi7,
          libjemalloc2,
          libjpeg62-turbo,

diff --git a/debian/rules b/debian/rules
index 4f6987e60fd49d3f4efc3a9024fd357c1838ad4e..8f428c77704b4a2240b6b11859c189c6e95373f6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -159,7 +159,9 @@ binary-arch: build install
 #      dh_perl
 #      dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps
+       # Debian >= Buster has libglusterfs0 and lots of libgfFOO, upstream has the libs in glusterfs-common
+       # pass -x to dpkg-shlibdeps and specify dependencies in d/control instead
+       dh_shlibdeps -- -xlibglusterfs0 -xlibgfxdr0 -xlibgfrpc0 -xlibgfdb0 -xlibgfchangelog0 -xlibgfapi0
        dh_gencontrol
        dh_md5sums
        dh_builddeb