Apply wrap-and-sort to control*

diff --git a/debian/control b/debian/control
index 1b73d3370e2c9175354bf56804710cac12f8ea52..a1fb61dce56f2b8eb99a4883c20cb7cf1921dbc3 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -17,8 +17,13 @@ Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
 
 Package: spl-dkms
 Architecture: all
-Depends: dkms (>> 2.2.1.0), file, libc-dev, libelf-dev, lsb-release, ${misc:Depends}
-Recommends: spl (>= ${source:Upstream-Version})
+Depends: dkms (>> 2.2.1.0),
+         file,
+         libc-dev,
+         libelf-dev,
+         lsb-release,
+         ${misc:Depends}
+Recommends: spl (>= ${source:Upstream-Version}),
 Provides: spl-modules
 Description: Solaris Porting Layer kernel modules for Linux
  The Solaris Porting Layer (SPL) is a Linux kernel module which provides

diff --git a/debian/control.in b/debian/control.in
index 1b73d3370e2c9175354bf56804710cac12f8ea52..02d3182be13b07d3f81410def8ba82d32f301146 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -17,8 +17,14 @@ Vcs-Browser: https://salsa.debian.org/zfsonlinux-team/spl
 
 Package: spl-dkms
 Architecture: all
-Depends: dkms (>> 2.2.1.0), file, libc-dev, libelf-dev, lsb-release, ${misc:Depends}
-Recommends: spl (>= ${source:Upstream-Version})
+Depends: dkms (>> 2.2.1.0),
+         file,
+         libc-dev,
+         libelf-dev,
+         lsb-release,
+         ${misc:Depends}
+Recommends: spl (>= ${source:Upstream-Version}),
+         @LINUX_COMPAT@
 Provides: spl-modules
 Description: Solaris Porting Layer kernel modules for Linux
  The Solaris Porting Layer (SPL) is a Linux kernel module which provides

diff --git a/debian/control.modules.in b/debian/control.modules.in
index 6ef7bb8ac20f3fcf4df8d79f2e9f06c65897db64..580b5e12e2b12911010cbc3dfcb9b7bbc6daaf75 100644 (file)
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -2,15 +2,15 @@ Source: spl-linux
 Section: kernel
 Priority: extra
 Maintainer: Debian ZFS on Linux maintainers <pkg-zfsonlinux-devel@lists.alioth.debian.org>
-Build-Depends: autotools-dev,
- autoconf,
- autogen,
- automake,
- debhelper (>= 7.4),
- dkms (>> 2.1.1.2-5),
- libtool,
- linux-headers-_KVERS_-common,
- linux-headers-_KVERS_
+Build-Depends: autoconf,
+               autogen,
+               automake,
+               autotools-dev,
+               debhelper (>= 7.4),
+               dkms (>> 2.1.1.2-5),
+               libtool,
+               linux-headers-_KVERS_,
+               linux-headers-_KVERS_-common
 Standards-Version: 4.1.2
 Homepage: http://www.zfsonlinux.org/
 Vcs-Git: git@salsa.debian.org:zfsonlinux-team/spl.git
@@ -31,7 +31,7 @@ Description: Solaris Porting Layer kernel modules for Linux (kernel _KVERS_)
  .
  If you have compiled your own kernel, you will most likely need to build
  your own spl-modules. The spl-source package has been
- provided for use with the Debian kernel-package utility to produce a 
+ provided for use with the Debian kernel-package utility to produce a
  version of spl-module for your kernel.
 
 Package: spl-modules-_KVERS_-di
@@ -39,7 +39,7 @@ Package-Type: udeb
 Provides: spl-modules-_KVERS_-udeb
 Section: debian-installer
 Architecture: _ARCH_
-Depends: ${shlibs:Depends}, ${misc:Depends}, zlib-modules-_KVERS_-di
+Depends: zlib-modules-_KVERS_-di, ${misc:Depends}, ${shlibs:Depends}
 Description: Solaris Porting Layer kernel modules for Linux (debian-installar version for kernel _KVERS_)
  The Solaris Porting Layer (SPL) is a Linux kernel module which provides
  many of the Solaris kernel APIs. This shim layer makes it possible to