[Glibc-bsd-commits] r3937 - trunk/zfsutils/debian

[Robert Millan]

Author: rmh
Date: 2011-12-07 20:07:06 +0000 (Wed, 07 Dec 2011)
New Revision: 3937

Added:
   trunk/zfsutils/debian/zfsutils-udeb.isinstallable
Modified:
   trunk/zfsutils/debian/control
Log:
Remove the Conflicts, use isinstallable script instead.

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2011-12-07 20:05:59 UTC (rev 3936)
+++ trunk/zfsutils/debian/control	2011-12-07 20:07:06 UTC (rev 3937)
@@ -112,10 +112,6 @@
  libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),
  libzfs1-udeb (= ${binary:Version}), libumem1-udeb (= ${binary:Version}), libzpool1-udeb (= ${binary:Version}),
  zfs-modules,
-Conflicts:
-# Pre-28 versions are ABI-incompatible
- zfs-modules-8.2-1-486-di [kfreebsd-i386] | zfs-modules-8.2-1-amd64-di [kfreebsd-amd64],
- zfs-modules-8.1-1-486-di [kfreebsd-i386] | zfs-modules-8.1-1-amd64-di [kfreebsd-amd64],
 Description: command-line tools to manage ZFS filesystems (debian-installer version)
  The Z file system is a pooled filesystem designed for maximum data integrity,
  supporting data snapshots, multiple copies, and data checksums.

Added: trunk/zfsutils/debian/zfsutils-udeb.isinstallable
===================================================================
--- trunk/zfsutils/debian/zfsutils-udeb.isinstallable	                        (rev 0)
+++ trunk/zfsutils/debian/zfsutils-udeb.isinstallable	2011-12-07 20:07:06 UTC (rev 3937)
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Require ZFS v28 in kernel
+case $(uname -r) in
+    8.3-* | 9.0-*) exit 0 ;;
+    *) exit 1 ;;
+esac