Update descriptions, remove troublesome Replaces

diff --git a/debian/control b/debian/control
index 00ab414d6af58ce99d0ed31a07a9efbb1ffe917d..21c3e966e669f3d322d6297dd2c4cddff9df7dcc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -50,12 +50,14 @@ Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libuutil0
 Description: Solaris userland utility library for Linux
  This library provides a variety of glue functions for ZFS on Linux:
- * libspl: The Solaris Porting Layer library, which provides APIs that make it
-   possible to run Solaris user code in a Linux environment with relatively
-   minimal modification.
- * libavl: The Adelson-Velskii Landis balanced binary tree manipulation library.
- * libefi: The Extensible Firmware Interface library for GUID disk partitioning.
- * libshare: NFS and SMB service integration for ZFS.
+  * libspl: The Solaris Porting Layer userland library, which provides APIs
+    that make it possible to run Solaris user code in a Linux environment
+    with relatively minimal modification.
+  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
+    library.
+  * libefi: The Extensible Firmware Interface library for GUID disk
+    partitioning.
+  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
 
 Package: libuutil1-dbg
 Section: debug
@@ -65,12 +67,14 @@ Depends: ${misc:Depends}, libuutil1 (= ${binary:Version})
 Replaces: libuutil0-dbg
 Description: Debugging symbols for libuutil1
  This library provides a variety of glue functions for ZFS on Linux:
- * libspl: The Solaris Porting Layer library, which provides APIs that make it
-   possible to run Solaris user code in a Linux environment with relatively
-   minimal modification.
- * libavl: The Adelson-Velskii Landis balanced binary tree manipulation library.
- * libefi: The Extensible Firmware Interface library for GUID disk partitioning.
- * libshare: NFS and SMB service integration for ZFS.
+  * libspl: The Solaris Porting Layer userland library, which provides APIs
+    that make it possible to run Solaris user code in a Linux environment
+    with relatively minimal modification.
+  * libavl: The Adelson-Velskii Landis balanced binary tree manipulation
+    library.
+  * libefi: The Extensible Firmware Interface library for GUID disk
+    partitioning.
+  * libshare: NFS, SMB, and iSCSI service integration for ZFS.
  .
  This package contains the debugging symbols for libuutil1.
 
@@ -79,18 +83,12 @@ Section: libdevel
 Architecture: linux-any
 Depends: ${misc:Depends}, libzfs1 (= ${binary:Version})
 Provides: libnvpair-dev, libuutil-dev
-Replaces: libefi1,
- libnvpair1,
- libshare1,
- libspl1,
- libunicode1,
- libuutil1,
- libzavl1,
- libzfs1,
- libzpool1,
 Description: Native ZFS filesystem development files for Linux
- Header files and static libraries for compiling software
- against libzfs.
+ Header files and static libraries for compiling software  against
+ libraries of native ZFS filesystem.
+ .
+ This package includes the development files of libnvpair1, libuutil1,
+ and libzfs1.
 
 Package: libzfs1
 Section: libs
@@ -100,7 +98,7 @@ Replaces: libzfs0
 Description: Native ZFS filesystem library for Linux
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
- checksums. 
+ checksums.
  .
  The ZFS library provides support for managing ZFS filesystems.
 
@@ -113,7 +111,7 @@ Replaces: libzfs0-dbg
 Description: Debugging symbols for libzfs1
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
- checksums. 
+ checksums.
  .
  This package contains the debugging symbols for libzfs1.
 
@@ -125,7 +123,7 @@ Replaces: libzpool0
 Description: Native ZFS pool library for Linux
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
- checksums. 
+ checksums.
  .
  This zpool library provides support for managing zpools.
 
@@ -138,14 +136,14 @@ Replaces: libzpool0-dbg
 Description: Debugging symbols for libzpool1
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
- checksums. 
+ checksums.
  .
  This package contains the debugging symbols for libzpool1.
 
 Package: zfs-dkms
 Architecture: linux-any
 Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
-Depends: ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release, debconf
+Depends: ${misc:Depends}, dkms (>> 2.1.1.2-5), lsb-release
 Replaces: lzfs, lzfs-dkms
 Provides: lustre-backend-fs, lzfs, lzfs-dkms
 Conflicts: lzfs, lzfs-dkms
@@ -180,9 +178,12 @@ Recommends: zfs-dkms
 Suggests: samba-common-bin (>= 3.0.23), nfs-kernel-server, zfs-initramfs
 Conflicts: zfs, zfs-fuse
 Replaces: zfs
-Description: Native ZFS management utilities for Linux
- This package provides the zpool and zfs commands that are used to
- manage ZFS filesystems.
+Description: command-line tools to manage ZFS filesystems
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data checksums.
+ .
+ This package provides the zfs and zpool commands to create and administer
+ ZFS filesystems.
 
 Package: zfsutils-dbg
 Section: debug
@@ -191,7 +192,7 @@ Architecture: linux-any
 Depends: ${misc:Depends}, zfsutils (= ${binary:Version})
 Replaces: zfs-dbg
 Description: Debugging symbols for zfsutils
- This package provides the zpool and zfs commands that are used to
- manage ZFS filesystems.
+ The Z file system is a pooled filesystem designed for maximum data
+ integrity, supporting data snapshots, multiple copies, and data checksums.
  .
  This package contains the debugging symbols for zfsutils.