Refresh debian/patches after upstream merge.

diff --git a/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch b/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
index d87daa6c71c0416936536fec9963a6b9a22a3eb1..469795b25459c68068b763d203c67008a10d8672 100644 (file)
--- a/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
+++ b/debian/patches/0006-Improve-the-with-spl-error-for-DKMS-systems.patch
@@ -13,10 +13,10 @@ or to bundle SPL into the ZFS package.
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4
-index 13238d8..d1d27f5 100644
+index 34969c3..db603d6 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
-@@ -319,9 +319,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -320,9 +320,10 @@ AC_DEFUN([ZFS_AC_SPL], [
                ], [
                        AC_MSG_RESULT([Not found])
                        AC_MSG_ERROR([

diff --git a/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch b/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
index 129f6c76b1fc894ac08fabe70083e4eaf3929de3..34023a5f7ecd894da80dd6f88df20ac29fdf6e2e 100644 (file)
--- a/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
+++ b/debian/patches/0007-Improve-the-SPL-version-error-for-DKMS-systems.patch
@@ -16,10 +16,10 @@ Closes: dajhorn/pkg-zfs#30
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/config/kernel.m4 b/config/kernel.m4
-index d1d27f5..455f0ff 100644
+index db603d6..39a4d45 100644
 --- a/config/kernel.m4
 +++ b/config/kernel.m4
-@@ -352,7 +352,10 @@ AC_DEFUN([ZFS_AC_SPL], [
+@@ -353,7 +353,10 @@ AC_DEFUN([ZFS_AC_SPL], [
                AC_MSG_RESULT([Not found])
                AC_MSG_ERROR([
        *** Cannot determine the version of the spl source.