Expand zfs-test and add Breaks/Conflicts

diff --git a/debian/control b/debian/control
index 9e4f8fa7204e6159b3db1bd0b47cd11807e2a505..8d85529cc83db5fcf5085ea15ac6f08567087d5d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -180,8 +180,8 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: zfsutils-linux (<= 0.6.5.11-1)
-Replaces: zfsutils-linux (<= 0.6.5.11-1)
+Breaks: zfsutils-linux (<= 0.7.9-2)
+Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
  The Z file system is a pooled filesystem designed for maximum data

diff --git a/debian/control.in b/debian/control.in
index e193f0178446adf90170fae4c85aa97e863ab604..9970875ed38a1c5a51a351e33704b44632497f8a 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -180,8 +180,8 @@ Depends: acl,
          zfsutils-linux (>=${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
-Breaks: zfsutils-linux (<= 0.6.5.11-1)
-Replaces: zfsutils-linux (<= 0.6.5.11-1)
+Breaks: zfsutils-linux (<= 0.7.9-2)
+Replaces: zfsutils-linux (<= 0.7.9-2)
 Conflicts: zutils
 Description: OpenZFS test infrastructure an support scripts
  The Z file system is a pooled filesystem designed for maximum data

diff --git a/debian/tests/control b/debian/tests/control
index 3d704baccda289ba8e8a5793f29fdbb500ffd044..d03b365ba8caf4ee3579fdbb12a41880453cafc4 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: kernel-smoke-test
 Restrictions: needs-root
-Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms
+Depends: zfsutils-linux, zfs-zed, zfs-initramfs, zfs-dkms, zfs-test

diff --git a/debian/zfs-test.install b/debian/zfs-test.install
index 225d51fce712a277ada9f04676163ad813ba1b4f..ec850df89603ebda9c8ef9939602884f9335a2b3 100644 (file)
--- a/debian/zfs-test.install
+++ b/debian/zfs-test.install
@@ -1,8 +1,12 @@
+sbin/zinject
+sbin/zpios
 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/man/man1/zpios.1
+usr/share/man/man1/ztest.1
+usr/share/man/man8/zinject.8
 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 238e00a2cb0ebfc0329415d77c33621acea50586..180168224065b55d8032042d4d4947c98ab5ab46 100644 (file)
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -15,8 +15,6 @@ sbin/mount.zfs
 sbin/zdb
 sbin/zfs
 sbin/zhack
-sbin/zinject
-sbin/zpios
 sbin/zpool
 sbin/zstreamdump
 usr/bin/zgenhostid
@@ -25,7 +23,7 @@ usr/lib/zfs-linux/zpool.d/
 usr/sbin/arc_summary
 usr/sbin/arcstat
 usr/sbin/dbufstat
-usr/share/man/man1/
+usr/share/man/man1/zhack.1
 usr/share/man/man5/
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
@@ -33,6 +31,5 @@ usr/share/man/man8/vdev_id.8
 usr/share/man/man8/zdb.8
 usr/share/man/man8/zfs.8
 usr/share/man/man8/zgenhostid.8
-usr/share/man/man8/zinject.8
 usr/share/man/man8/zpool.8
 usr/share/man/man8/zstreamdump.8