[pve-devel] [PATCH zfsonlinux 4/5] d/control: record conflict with nordugrid-arc-client

[Stoiko Ivanov]

nordugrid-arc-client also ships /usr/bin/arcstat, which conflicts
with zfsutils-linux after usrmerge and moving files from sbin to bin.

See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1063457 for
further details.

based on upstream https://salsa.debian.org/zfsonlinux-team/zfs/
commit 779b5232db366c4e48b159a76cb0d18be4452273

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index f2688dfac..8be70d999 100644
--- a/debian/control
+++ b/debian/control
@@ -213,7 +213,7 @@ Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${shlibs:Depends},
 Recommends: zfs-zed,
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs,
-Conflicts: zfs, zfs-fuse,
+Conflicts: zfs, zfs-fuse, nordugrid-arc-client
 Provides: zfsutils,
 Description: command-line tools to manage OpenZFS filesystems
  OpenZFS is a storage platform that encompasses the functionality of
-- 
2.39.5