Merge branch 'sid'

[nfs-utils.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 204ac7abb44f895199ec539c50b807bd3969f863..215401dd15dd5f6e95fdef72eab9c7df1ae279f8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,6 @@ build-stamp:
                --enable-nfsv41 \
                --enable-ipv6 \
                --enable-libmount-mount \
-               --with-gssglue \
                --with-tcp-wrappers
        $(MAKE) $(MAKEFLAGS)
        touch build-stamp
@@ -55,7 +54,11 @@ binary-arch: build
        dh_install -Xman --fail-missing
        dh_installdocs -A
        dh_installdocs -pnfs-common debian/README.Debian.nfsv4
-       install -m 0755 debian/nfs-common.init debian/nfs-common/etc/init.d/nfs-common
+       dh_systemd_enable -p nfs-common nfs-client.target
+       dh_systemd_enable -p nfs-kernel-server nfs-server.service
+       dh_installinit -pnfs-common -R
+       dh_systemd_start -p nfs-common --restart-after-upgrade nfs-utils.service
+       dh_systemd_start -p nfs-kernel-server --restart-after-upgrade nfs-server.service
        install -m 0755 debian/nfs-kernel-server.init debian/nfs-kernel-server/etc/init.d/nfs-kernel-server
        install -m 0644 debian/nfs-common.bugcontrol debian/nfs-common/usr/share/bug/nfs-common/control
        install -m 0755 debian/nfs-common.bugscript debian/nfs-common/usr/share/bug/nfs-common/script
@@ -68,6 +71,7 @@ binary-arch: build
        dh_strip
        dh_compress
        dh_fixperms
+       chmod +x debian/nfs-common/usr/lib/systemd/scripts/nfs-utils_env.sh
        chmod u+s debian/nfs-common/sbin/mount.nfs
        dh_installdeb
        dh_shlibdeps