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

[Robert Millan]

Author: rmh
Date: 2011-12-03 16:16:08 +0000 (Sat, 03 Dec 2011)
New Revision: 3912

Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
Log:
Require zfs-modules in zfsutils-udeb, but only versions that provide ZFS v28 or later.

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-12-01 21:49:14 UTC (rev 3911)
+++ trunk/zfsutils/debian/changelog	2011-12-03 16:16:08 UTC (rev 3912)
@@ -1,3 +1,10 @@
+zfsutils (8.3~svn226546-6) UNRELEASED; urgency=low
+
+  * Require zfs-modules in zfsutils-udeb, but only versions that provide
+    ZFS v28 or later.
+
+ -- Robert Millan <rmh at debian.org>  Sat, 03 Dec 2011 17:15:57 +0100
+
 zfsutils (8.3~svn226546-5) unstable; urgency=low
 
   * zfsutils.zfs.init:

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2011-12-01 21:49:14 UTC (rev 3911)
+++ trunk/zfsutils/debian/control	2011-12-03 16:16:08 UTC (rev 3912)
@@ -109,7 +109,12 @@
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),
- libzfs1-udeb (= ${binary:Version}), libumem1-udeb (= ${binary:Version}), libzpool1-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.