[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.6-2-9-gdef393b

[Aron Xu]

The following commit has been merged in the master branch:
commit def393bb4baf86af00ee90614ab791ec537208f9
Author: Aron Xu <aron at debian.org>
Date:   Tue May 31 15:38:10 2016 +0800

    Add back the headers that was removed unexpectedly

diff --git a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
index a073717..2a36884 100644
--- a/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
+++ b/debian/patches/0001-Prevent-manual-builds-in-the-DKMS-source.patch
@@ -1,3 +1,12 @@
+Description: Block manual building in the DKMS source tree.
+  To avoid messing up future DKMS builds and the zfs installation,
+  block manual building of the DKMS source tree.
+Author: unknown
+Origin: ubuntu
+Forwarded: no
+Reviewed-By: Petter Reinholdtsen <pere at hungry.com>
+Last-Update: 2016-05-12
+
 Index: zfs-linux-0.6.5.6/config/dkms.m4
 ===================================================================
 --- /dev/null
@@ -35,7 +44,7 @@ Index: zfs-linux-0.6.5.6/config/zfs-build.m4
 +++ zfs-linux-0.6.5.6/config/zfs-build.m4
 @@ -87,8 +87,8 @@ AC_DEFUN([ZFS_AC_CONFIG], [
  	ZFS_AC_CONFIG_ALWAYS
- 
+
  	case "$ZFS_CONFIG" in
 -		kernel) ZFS_AC_CONFIG_KERNEL ;;
  		user)	ZFS_AC_CONFIG_USER   ;;

-- 
OpenZFS on Linux