[Pkg-zfsonlinux-devel] [SCM] spl branch, master, updated. debian/0.6.4.2-1-5-gee4726c

[Aron Xu]

The following commit has been merged in the master branch:
commit ee4726cdec0a0d0613418a4cd95a9b5cc09ed543
Author: Aron Xu <aron at debian.org>
Date:   Tue Oct 13 15:57:34 2015 +0100

    Fix conflicts

diff --git a/debian/control b/debian/control
index 9619617..a259615 100644
--- a/debian/control
+++ b/debian/control
@@ -40,9 +40,8 @@ Description: Solaris Porting Layer kernel modules for Linux
 
 Package: spl
 Architecture: linux-any
-Conflicts: spl-dev
+Conflicts: spl-dev, splat
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: splat
 Recommends: spl-modules | spl-dkms
 Description: Solaris Porting Layer user-space utilities 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 9619617..a259615 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -40,9 +40,8 @@ Description: Solaris Porting Layer kernel modules for Linux
 
 Package: spl
 Architecture: linux-any
-Conflicts: spl-dev
+Conflicts: spl-dev, splat
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Conflicts: splat
 Recommends: spl-modules | spl-dkms
 Description: Solaris Porting Layer user-space utilities for Linux
  The Solaris Porting Layer (SPL) is a Linux kernel module which provides

-- 
Solaris Porting Layer for Linux