Move more zfs test tools to zfs-test package (Closes: #868653)

diff --git a/debian/control b/debian/control
index 3cf6fb6495507ac315c4281797a3a3ccb89395e2..cf6e3ddc63c53aaa54af7529cd599771cdbe17d6 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -91,8 +91,7 @@ Architecture: all
 Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
              spl-dkms (>= ${source:Upstream-Version})
 Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}),
-              linux-libc-dev (< 4.16)
+Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), linux-libc-dev (< 4.16)
 Provides: zfs-modules
 Description: OpenZFS filesystem kernel modules for Linux
  The Z file system is a pooled filesystem designed for maximum data
@@ -140,7 +139,7 @@ Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
           zfs-initramfs | zfs-dracut
-Conflicts: zfs, zfs-fuse, zutils
+Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data
@@ -183,6 +182,7 @@ Depends: acl,
          ${shlibs:Depends}
 Breaks: zfsutils-linux (<= 0.6.5.11-1)
 Replaces: zfsutils-linux (<= 0.6.5.11-1)
+Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data

diff --git a/debian/control.in b/debian/control.in
index aef8cac2e4f8df246ee18ca2002fa10a596d1430..e193f0178446adf90170fae4c85aa97e863ab604 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -91,8 +91,7 @@ Architecture: all
 Pre-Depends: spl-dkms (<<${source:Upstream-Version}.),
              spl-dkms (>= ${source:Upstream-Version})
 Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}),
-              @LINUX_COMPAT@
+Recommends: zfs-zed, zfsutils-linux (>= ${binary:Version}), @LINUX_COMPAT@
 Provides: zfs-modules
 Description: OpenZFS filesystem kernel modules for Linux
  The Z file system is a pooled filesystem designed for maximum data
@@ -140,7 +139,7 @@ Breaks: zfs-dkms (<< ${binary:Version}), zfs-dkms (>> ${binary:Version})
 Suggests: nfs-kernel-server,
           samba-common-bin (>= 3.0.23),
           zfs-initramfs | zfs-dracut
-Conflicts: zfs, zfs-fuse, zutils
+Conflicts: zfs, zfs-fuse
 Provides: zfsutils
 Description: command-line tools to manage OpenZFS filesystems
  The Z file system is a pooled filesystem designed for maximum data
@@ -183,6 +182,7 @@ Depends: acl,
          ${shlibs:Depends}
 Breaks: zfsutils-linux (<= 0.6.5.11-1)
 Replaces: zfsutils-linux (<= 0.6.5.11-1)
+Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data

diff --git a/debian/zfs-test.install b/debian/zfs-test.install
index 46a8685624f172d8c787ba3e5c5229645da471dc..225d51fce712a277ada9f04676163ad813ba1b4f 100644 (file)
--- a/debian/zfs-test.install
+++ b/debian/zfs-test.install
@@ -1,4 +1,8 @@
+sbin/ztest
 usr/bin/raidz_test
+usr/share/man/man1/ztest.1
+usr/share/man/man1/raidz_test.1
+usr/share/man/man1/test-runner.1
 usr/share/zfs/common.sh
 usr/share/zfs/common.sh
 usr/share/zfs/common.sh

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index b985ade4e73e69eab950b5b20ec10f67659da6ca..238e00a2cb0ebfc0329415d77c33621acea50586 100644 (file)
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -19,7 +19,6 @@ sbin/zinject
 sbin/zpios
 sbin/zpool
 sbin/zstreamdump
-sbin/ztest
 usr/bin/zgenhostid
 usr/lib/modules-load.d/ lib/
 usr/lib/zfs-linux/zpool.d/