[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.7-2-8-gdcd337f

[Aron Xu]

The following commit has been merged in the master branch:
commit 32b343ef83b4f9531d342d18952f7ce7398d4520
Author: Aron Xu <aron at debian.org>
Date:   Tue Sep 20 15:24:13 2016 +0800

    Conflicts with zutils (Closes: #836853)

diff --git a/debian/control b/debian/control
index ee0a96a..db75496 100644
--- a/debian/control
+++ b/debian/control
@@ -130,7 +130,7 @@ Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
-Conflicts: zfs, zfs-fuse
+Conflicts: zfs, zfs-fuse, zutils
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data
diff --git a/debian/control.in b/debian/control.in
index ee0a96a..db75496 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -130,7 +130,7 @@ Architecture: linux-any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Recommends: lsb-base, zfs-modules | zfs-dkms, zfs-zed
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs | zfs-dracut
-Conflicts: zfs, zfs-fuse
+Conflicts: zfs, zfs-fuse, zutils
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data

-- 
OpenZFS on Linux