[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-638-g3dce996

[Aron Xu]

The following commit has been merged in the master branch:
commit 5226596377cc3e227cd82c0b556875a86de6a727
Author: Aron Xu <aron at debian.org>
Date:   Mon Nov 2 10:47:07 2015 +0800

    More OpenZFS branding

diff --git a/debian/control.modules.in b/debian/control.modules.in
index 92de81f..e271698 100644
--- a/debian/control.modules.in
+++ b/debian/control.modules.in
@@ -21,14 +21,14 @@ Architecture: _ARCH_
 Provides: zfs-modules
 Depends: linux-image-_KVERS_, spl-modules | spl-dkms
 Recommends: zfsutils
-Description: Native ZFS filesystem kernel modules for Linux (kernel _KVERS_)
+Description: OpenZFS filesystem kernel modules for Linux (kernel _KVERS_)
  An advanced integrated volume manager and filesystem that is designed for
  performance and data integrity. Snapshots, clones, checksums, deduplication,
  compression, and RAID redundancy are built-in features.
  .
  This package contains the compiled kernel module for _KVERS_
  .
- Includes the SPA, DMU, ZVOL, and ZPL components of ZFS.
+ Includes the SPA, DMU, ZVOL, and ZPL components of OpenZFS.
  .
  If you have compiled your own kernel, you will most likely need to build
  your own zfs-modules. The zfs-source package has been
@@ -41,7 +41,7 @@ Section: contrib/debian-installer
 Architecture: _ARCH_
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: zfs-modules, zfs-modules-_KVERS_-udeb
-Description: Native ZFS filesystem kernel modules for Linux (debian-installar version for kernel _KVERS_)
+Description: OpenZFS filesystem kernel modules for Linux (debian-installar version for kernel _KVERS_)
  An advanced integrated volume manager and filesystem that is designed for
  performance and data integrity. Snapshots, clones, checksums, deduplication,
  compression, and RAID redundancy are built-in features.
diff --git a/debian/control.udeb.in b/debian/control.udeb.in
index ffb9aab..749ab7a 100644
--- a/debian/control.udeb.in
+++ b/debian/control.udeb.in
@@ -34,11 +34,11 @@ Package-Type: udeb
 Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris ZFS library (debian-installer)
+Description: OpenZFS library (debian-installer)
  The Z file system is a pooled filesystem designed for maximum data integrity,
  supporting data snapshots, multiple copies, and data checksums.
  .
- The ZFS library provides support for managing ZFS filesystems.
+ The OpenZFS library provides support for managing OpenZFS filesystems.
  .
  This is a minimal package for use in debian-installer.
 
@@ -47,7 +47,7 @@ Package-Type: udeb
 Section: contrib/debian-installer
 Architecture: linux-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Native ZFS pool library for Linux (debian-installer)
+Description: OpenZFS pool library for Linux (debian-installer)
  The Z file system is a pooled filesystem designed for maximum data
  integrity, supporting data snapshots, multiple copies, and data
  checksums.
@@ -64,11 +64,11 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  libuutil1-udeb (= ${binary:Version}), libnvpair1-udeb (= ${binary:Version}),
  libzfs2-udeb (= ${binary:Version}), libzpool2-udeb (= ${binary:Version}),
  zfs-modules,
-Description: command-line tools to manage ZFS filesystems (debian-installer)
+Description: command-line tools to manage OpenZFS filesystems (debian-installer)
  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.
+ OpenZFS filesystems.
  .
  This is a minimal package for use in debian-installer.

-- 
ZFS on Linux