From ce930ec544e85c2b1cf9fc72a351586118976828 Mon Sep 17 00:00:00 2001 From: Darik Horn Date: Fri, 18 Jan 2013 22:13:58 -0600 Subject: [PATCH] Refresh debian/patches after upstream merge. --- .../patches/0003-Remove-all-upstream-init.d-components.patch | 2 +- .../patches/0004-Remove-the-upstream-dracut-component.patch | 2 +- .../0006-Improve-the-with-spl-error-for-DKMS-systems.patch | 4 ++-- .../0007-Improve-the-SPL-version-error-for-DKMS-systems.patch | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/patches/0003-Remove-all-upstream-init.d-components.patch b/debian/patches/0003-Remove-all-upstream-init.d-components.patch index 2fd5d8cf..651f13b0 100644 --- a/debian/patches/0003-Remove-all-upstream-init.d-components.patch +++ b/debian/patches/0003-Remove-all-upstream-init.d-components.patch @@ -26,7 +26,7 @@ bundles init files according to Debian packaging policy. delete mode 100644 etc/init.d/zfs.redhat.in diff --git a/configure.ac b/configure.ac -index 2b79f5f..a1f207f 100644 +index 2abd05d..da40356 100644 --- a/configure.ac +++ b/configure.ac @@ -61,7 +61,6 @@ AC_CONFIG_FILES([ diff --git a/debian/patches/0004-Remove-the-upstream-dracut-component.patch b/debian/patches/0004-Remove-the-upstream-dracut-component.patch index d3e926e6..98e7e2a7 100644 --- a/debian/patches/0004-Remove-the-upstream-dracut-component.patch +++ b/debian/patches/0004-Remove-the-upstream-dracut-component.patch @@ -39,7 +39,7 @@ index 833bee6..fac18fd 100644 if CONFIG_KERNEL SUBDIRS += module diff --git a/configure.ac b/configure.ac -index a1f207f..a418b51 100644 +index da40356..2e136d3 100644 --- a/configure.ac +++ b/configure.ac @@ -56,8 +56,6 @@ ZFS_AC_DEBUG_DMU_TX 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 b8ed7b53..0d2a3c90 100644 --- 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 aab3a16..6b2b9dc 100644 +index fd6ab1f..53b3077 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 -@@ -324,9 +324,10 @@ AC_DEFUN([ZFS_AC_SPL], [ +@@ -328,9 +328,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 0d6e8b5e..371af08c 100644 --- 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 6b2b9dc..b124a80 100644 +index 53b3077..f0a4609 100644 --- a/config/kernel.m4 +++ b/config/kernel.m4 -@@ -357,7 +357,10 @@ AC_DEFUN([ZFS_AC_SPL], [ +@@ -361,7 +361,10 @@ AC_DEFUN([ZFS_AC_SPL], [ AC_MSG_RESULT([Not found]) AC_MSG_ERROR([ *** Cannot determine the version of the spl source. -- 2.39.5