Minor packaging cleanup

Signed-off-by: Antonio Russo <antonio.e.russo@gmail.com>

diff --git a/debian/rules b/debian/rules
index f3f15e4a7680863c3749efaa8b0e6baeaf85648b..7c8fc6248ac352b1af24f038661cebaf8ad23e30 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -86,13 +86,12 @@ override_dh_auto_install:
        mv '$(CURDIR)/debian/tmp/usr/bin/dbufstat.py' '$(CURDIR)/debian/tmp/usr/sbin/dbufstat'
 
        @# Zed has dependencies outside of the system root.
-       $(INSTALL) -d '$(CURDIR)/debian/tmp/usr/sbin/'
        mv '$(CURDIR)/debian/tmp/sbin/zed' '$(CURDIR)/debian/tmp/usr/sbin/zed'
 
        @# Install the DKMS source.
        @# We only want the files needed to build the modules
-       mkdir -p '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'
-       cp '$(CURDIR)/scripts/enum-extract.pl' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts'
+       install -D -t '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)/scripts' \
+               '$(CURDIR)/scripts/enum-extract.pl'
        $(foreach file,$(DKMSFILES),mv '$(CURDIR)/$(NAME)-$(DEB_VERSION_UPSTREAM)/$(file)' '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(DEB_VERSION_UPSTREAM)' || exit 1;)
        @# Hellish awk line:
        @#  * Deletes from configure.ac the parts not needed for building the kernel module
@@ -121,8 +120,8 @@ override_dh_auto_install:
                rm $${i}; \
        done
 
-       chmod a-x $(CURDIR)/debian/tmp/etc/zfs/zfs-functions
-       chmod a-x $(CURDIR)/debian/tmp/etc/default/zfs
+       chmod a-x '$(CURDIR)/debian/tmp/etc/zfs/zfs-functions'
+       chmod a-x '$(CURDIR)/debian/tmp/etc/default/zfs'
        chmod a-x '$(CURDIR)/debian/tmp/usr/share/bash-completion/completions/zfs'
 
 override_dh_dkms:

diff --git a/debian/zfs-test.install b/debian/zfs-test.install
index ec850df89603ebda9c8ef9939602884f9335a2b3..2067af7e64461d83a1c79c3f88b098319f47ce73 100644 (file)
--- a/debian/zfs-test.install
+++ b/debian/zfs-test.install
@@ -8,9 +8,6 @@ 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
-usr/share/zfs/common.sh
 usr/share/zfs/runfiles/
 usr/share/zfs/smb.sh
 usr/share/zfs/test-runner