Change utilities path (bindir) to /usr/sbin (Closes: #832938)

diff --git a/debian/changelog b/debian/changelog
index def7678bc8854ff5365fb3fff191681df5263543..9a8a52d9be45619e23bdbe11f1ad6fc20399b2db 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zfs-linux (0.6.5.7-2) unstable; urgency=medium
+
+  * Change utilities path (bindir) to /usr/sbin
+
+ -- Eric Desrochers <eric.desrochers@canonical.com>  Mon, 01 Aug 2016 15:53:58 -0400
+
 zfs-linux (0.6.5.7-1) unstable; urgency=medium
 
   [ YunQiang Su ]

diff --git a/debian/rules b/debian/rules
index 42816c5ca5d91f67cf8008d9360cb282e368c3ff..5036f42aaf6b2fcdd4e6046ee07e234226d2b404 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ endif
 
        @# Build the userland, but don't build the kernel modules.
        dh_auto_configure -- \
-         --bindir=/bin \
+         --bindir=/usr/sbin \
          --sbindir=/sbin \
          --libdir=/lib \
          --with-udevdir=/lib/udev \

diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index a12ad7b27eedd1fd23b1fb1eda7464c52e65bfb6..99cc48c312b16fa571a509a61e1f6365658f5346 100644 (file)
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -5,7 +5,6 @@ usr/lib/modules-load.d/ lib/
 lib/udev/
 etc/default/zfs
 etc/zfs/zfs-functions
-bin/
 sbin/fsck.zfs
 sbin/mount.zfs
 sbin/ztest
@@ -16,6 +15,9 @@ sbin/zdb
 sbin/zpios
 sbin/zpool
 sbin/zfs
+usr/sbin/arc_summary.py
+usr/sbin/arcstat.py
+usr/sbin/dbufstat.py
 usr/share/zfs/
 usr/share/man/man1/
 usr/share/man/man5/