Pedantic format change

[mirror_zfs-debian.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 858d9b15775ca8a1d637ce2ee3469f2d7857c370..003b9950d0d03771f1a731580f8ce5313380aeb5 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ VERSION := $(shell dpkg-parsechangelog \
 DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
                DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
 
-export SHLIB_MAJOR = 1
-
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
@@ -33,7 +31,7 @@ pmodules = $(PACKAGE)-modules-$(non_epoch_version)
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-       dh $@ --with dkms --parallel
+       dh $@ --with autoreconf,dkms --parallel
 
 override_dh_auto_configure:
        @cp debian/control.in debian/control
@@ -44,9 +42,6 @@ endif
        @# Embed the downstream version in the module.
        @sed -e 's/^Version:.*/Version:      $(VERSION)/' -i.orig META
 
-       @# Create the makefiles and configure script.
-       ./autogen.sh
-
        @# Build the userland, but don't build the kernel modules.
        dh_auto_configure -- \
          --bindir=/bin \
@@ -90,8 +85,7 @@ override_dh_auto_install:
 
        @# This shunt allows DKMS to install the Module.symvers and zfs_config.h
        @# files to the ${dkms_tree} area through the POST_INSTALL directive.
-       echo '#!/bin/sh'  >'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
-       echo 'cp "$$@"'  >>'$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
+       printf '#!/bin/sh\ncp "$$@"\n' > '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
        chmod 755 '$(CURDIR)/debian/tmp/usr/src/$(NAME)-$(VERSION)/cp'
 
        mkdir -p $(CURDIR)/debian/tmp/usr/lib
@@ -100,61 +94,32 @@ override_dh_auto_install:
                rm $${i}; \
        done
 
-override_dh_installinit:
-       @# Install the /etc/default/zfs options file.
-       dh_installinit --name=zfs
-
-       @# Install the /etc/init.d/zfs-mount script.
-ifeq ($(LSB_DISTRIBUTOR),Debian)
-       @# Debian runs local mounts at sysv sequences [10..12] [08..09].
-       dh_installinit --name=zfs-mount \
-         --no-restart-on-upgrade --no-start -- defaults 13 07
-else
-       dh_installinit --name=zfs-mount \
-         --no-restart-on-upgrade --no-start
-endif
-
-       @# Install the /etc/init.d/zfs-share script.
-ifeq ($(LSB_DISTRIBUTOR),Debian)
-       @# Debian runs nfs-kernel-server at sysv sequence 17 01,
-       @# iscsitarget at 02 01, and samba at 01 02.
-       dh_installinit --name=zfs-share \
-         --no-restart-on-upgrade --no-start -- defaults 18 00
-else ifeq ($(LSB_DISTRIBUTOR),Ubuntu)
-       @# Ubuntu runs nfs-kernel-server at sysv sequence 20 80,
-       @# iscsitarget at 20 20, and samba through upstart.
-       dh_installinit --name=zfs-share \
-         --no-restart-on-upgrade --no-start -- defaults 25 15
-else
-       dh_installinit --name=zfs-share \
-         --no-restart-on-upgrade --no-start
-endif
-
 override_dh_dkms:
        dh_dkms -V $(VERSION)
 
 override_dh_makeshlibs:
        dh_makeshlibs -a
 ifeq ($(BUILD_UDEB), true)
-       dh_makeshlibs -plibnvpair$(SHLIB_MAJOR) --add-udeb=libnvpair$(SHLIB_MAJOR)-udeb
-       dh_makeshlibs -plibuutil$(SHLIB_MAJOR) --add-udeb=libuutil$(SHLIB_MAJOR)-udeb
-       dh_makeshlibs -plibzfs$(SHLIB_MAJOR) --add-udeb=libzfs$(SHLIB_MAJOR)-udeb
-       dh_makeshlibs -plibzpool$(SHLIB_MAJOR) --add-udeb=libzpool$(SHLIB_MAJOR)-udeb
-       dh_makeshlibs -pzfsutils --add-udeb=zfsutils-udeb
-   endif
+       dh_makeshlibs -plibnvpair1linux --add-udeb=libnvpair1-udeb
+       dh_makeshlibs -plibuutil1linux --add-udeb=libuutil1-udeb
+       dh_makeshlibs -plibzfs2linux --add-udeb=libzfs2-udeb
+       dh_makeshlibs -plibzpool2linux --add-udeb=libzpool2-udeb
+       dh_makeshlibs -pzfsutils-linux --add-udeb=zfsutils-udeb
+endif
 
 override_dh_strip:
        dh_strip --dbg-package=zfs-dbg
 ifeq ($(BUILD_UDEB), true)
-       dh_strip -plibnvpair$(SHLIB_MAJOR)-udeb
-       dh_strip -plibuutil$(SHLIB_MAJOR)-udeb
-       dh_strip -plibzfs$(SHLIB_MAJOR)-udeb
-       dh_strip -plibzpool$(SHLIB_MAJOR)-udeb
+       dh_strip -plibnvpair1-udeb
+       dh_strip -plibuutil1-udeb
+       dh_strip -plibzfs2-udeb
+       dh_strip -plibzpool2-udeb
        dh_strip -pzfsutils-udeb
 endif
 
 override_dh_auto_clean:
        dh_auto_clean
+       debconf-updatepo
        @if test -e META.orig; then mv META.orig META; fi
        cp debian/control.in debian/control
 ifeq ($(BUILD_UDEB), true)
@@ -163,7 +128,7 @@ endif
 
 override_dh_install:
        find . -name lib*.la -delete
-       dh_install
+       dh_install --list-missing
 
 # ------------
 
@@ -223,5 +188,4 @@ override_dh_binary-modules: override_dh_prep-deb-files override_dh_configure_mod
        dh_installdeb -p${pmodules}
        dh_gencontrol -p${pmodules}
        dh_md5sums -p${pmodules}
-
        dh_builddeb -p${pmodules}