[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-638-g3dce996

[Aron Xu]

The following commit has been merged in the master branch:
commit e8f06defed606221cbf45b8564f4ac0e7b264f68
Author: Aron Xu <aron at debian.org>
Date:   Mon Nov 2 10:49:16 2015 +0800

    Use dh-autoreconf

diff --git a/debian/control b/debian/control
index 72c09a8..16a7449 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,7 @@ Priority: optional
 Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel at lists.alioth.debian.org>
 Uploaders: Aron Xu <aron at debian.org>,
            Carlos Alberto Lopez Perez <clopez at igalia.com>
-Build-Depends: autoconf,
-               autogen,
-               automake,
+Build-Depends: dh-autoreconf,
                autotools-dev,
                debhelper (>= 9),
                dkms (>> 2.1.1.2-5),
diff --git a/debian/control.in b/debian/control.in
index 72c09a8..16a7449 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -4,9 +4,7 @@ Priority: optional
 Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel at lists.alioth.debian.org>
 Uploaders: Aron Xu <aron at debian.org>,
            Carlos Alberto Lopez Perez <clopez at igalia.com>
-Build-Depends: autoconf,
-               autogen,
-               automake,
+Build-Depends: dh-autoreconf,
                autotools-dev,
                debhelper (>= 9),
                dkms (>> 2.1.1.2-5),
diff --git a/debian/rules b/debian/rules
index d3db8b6..36953c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,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 +44,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 \

-- 
ZFS on Linux