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

[Aron Xu]

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

    Add conflicts to splat (Closes: #769147)

diff --git a/debian/control b/debian/control
index 3bd9d92..9619617 100644
--- a/debian/control
+++ b/debian/control
@@ -42,6 +42,7 @@ Package: spl
 Architecture: linux-any
 Conflicts: spl-dev
 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 3bd9d92..9619617 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -42,6 +42,7 @@ Package: spl
 Architecture: linux-any
 Conflicts: spl-dev
 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