[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-614-g418ece3
Aron Xu
aron at debian.org
Thu Aug 13 15:40:33 UTC 2015
The following commit has been merged in the master branch:
commit 418ece333b6ee911743fc65e5ca298de23ccf71f
Author: Aron Xu <aron at debian.org>
Date: Thu Aug 13 23:09:01 2015 +0800
Rename of packages to avoid conflicts with bsd port
diff --git a/debian/control b/debian/control
index 112bea5..59477d0 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Homepage: http://www.zfsonlinux.org/
Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
-Package: libnvpair1
+Package: libnvpair1linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -30,7 +30,7 @@ Description: Solaris name-value library for Linux
transporting data across process boundaries, transporting between
kernel and userland, and possibly saving onto disk files.
-Package: libuutil1
+Package: libuutil1linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -45,10 +45,10 @@ Description: Solaris userland utility library for Linux
partitioning.
* libshare: NFS, SMB, and iSCSI service integration for ZFS.
-Package: libzfs-dev
+Package: libzfslinux-dev
Section: libdevel
Architecture: linux-any
-Depends: libzfs2 (= ${binary:Version}), ${misc:Depends}
+Depends: libzfs2linux (= ${binary:Version}), ${misc:Depends}
Provides: libnvpair-dev, libuutil-dev
Description: Native ZFS filesystem development files for Linux
Header files and static libraries for compiling software against
@@ -57,7 +57,7 @@ Description: Native ZFS filesystem development files for Linux
This package includes the development files of libnvpair1, libuutil1,
and libzfs2.
-Package: libzfs2
+Package: libzfs2linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -68,7 +68,7 @@ Description: Native ZFS filesystem library for Linux
.
The ZFS library provides support for managing ZFS filesystems.
-Package: libzpool1
+Package: libzpool1linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -83,7 +83,7 @@ Package: zfs-dkms
Architecture: all
Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfsutils
+Recommends: zfsutils-linux
Replaces: lzfs, lzfs-dkms
Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules
Conflicts: lzfs, lzfs-dkms
@@ -96,7 +96,7 @@ Description: Native ZFS filesystem kernel modules for Linux
Package: zfs-initramfs
Architecture: linux-any
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils, ${misc:Depends}
+Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
Description: Native ZFS root filesystem capabilities for Linux
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
@@ -105,7 +105,7 @@ Description: Native ZFS root filesystem capabilities for Linux
This package adds ZFS to the system initramfs with a hook
for the initramfs-tools infrastructure.
-Package: zfsutils
+Package: zfsutils-linux
Section: admin
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -113,6 +113,7 @@ Recommends: lsb-base, zfs-modules | zfs-dkms
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
Conflicts: zfs, zfs-fuse
Replaces: zfs
+Provides: zfsutils
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
@@ -125,16 +126,16 @@ Package: zfs-dbg
Section: debug
Priority: extra
Architecture: linux-any
-Depends: libnvpair1 (= ${binary:Version}),
- libuutil1 (= ${binary:Version}),
- libzfs2 (= ${binary:Version}),
- libzpool1 (= ${binary:Version}),
+Depends: libnvpair1linux (= ${binary:Version}),
+ libuutil1linux (= ${binary:Version}),
+ libzfs2linux (= ${binary:Version}),
+ libzpool1linux (= ${binary:Version}),
${misc:Depends}
-Recommends: zfsutils (= ${binary:Version})
+Recommends: zfsutils-linux (= ${binary:Version})
Description: Debugging symbols for ZFS userland libraries and tools
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 libzpoo1, libzfs2,
- libnvpair1, libuutil1, and zfsutils.
+ This package contains the debugging symbols for libzpoo1linux, libzfs2linux,
+ libnvpair1linux, libuutil1linux, and zfsutils-linux.
diff --git a/debian/control.in b/debian/control.in
index 112bea5..59477d0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -21,7 +21,7 @@ Homepage: http://www.zfsonlinux.org/
Vcs-Git: git://anonscm.debian.org/pkg-zfsonlinux/zfs.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-zfsonlinux/spl.git
-Package: libnvpair1
+Package: libnvpair1linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -30,7 +30,7 @@ Description: Solaris name-value library for Linux
transporting data across process boundaries, transporting between
kernel and userland, and possibly saving onto disk files.
-Package: libuutil1
+Package: libuutil1linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -45,10 +45,10 @@ Description: Solaris userland utility library for Linux
partitioning.
* libshare: NFS, SMB, and iSCSI service integration for ZFS.
-Package: libzfs-dev
+Package: libzfslinux-dev
Section: libdevel
Architecture: linux-any
-Depends: libzfs2 (= ${binary:Version}), ${misc:Depends}
+Depends: libzfs2linux (= ${binary:Version}), ${misc:Depends}
Provides: libnvpair-dev, libuutil-dev
Description: Native ZFS filesystem development files for Linux
Header files and static libraries for compiling software against
@@ -57,7 +57,7 @@ Description: Native ZFS filesystem development files for Linux
This package includes the development files of libnvpair1, libuutil1,
and libzfs2.
-Package: libzfs2
+Package: libzfs2linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -68,7 +68,7 @@ Description: Native ZFS filesystem library for Linux
.
The ZFS library provides support for managing ZFS filesystems.
-Package: libzpool1
+Package: libzpool1linux
Section: libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -83,7 +83,7 @@ Package: zfs-dkms
Architecture: all
Pre-Depends: spl-dkms (>= ${source:Upstream-Version})
Depends: dkms (>> 2.1.1.2-5), lsb-release, ${misc:Depends}
-Recommends: zfsutils
+Recommends: zfsutils-linux
Replaces: lzfs, lzfs-dkms
Provides: lustre-backend-fs, lzfs, lzfs-dkms, zfs-modules
Conflicts: lzfs, lzfs-dkms
@@ -96,7 +96,7 @@ Description: Native ZFS filesystem kernel modules for Linux
Package: zfs-initramfs
Architecture: linux-any
-Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils, ${misc:Depends}
+Depends: initramfs-tools, zfs-modules | zfs-dkms, zfsutils-linux, ${misc:Depends}
Description: Native ZFS root filesystem capabilities for Linux
The Z file system is a pooled filesystem designed for maximum data
integrity, supporting data snapshots, multiple copies, and data
@@ -105,7 +105,7 @@ Description: Native ZFS root filesystem capabilities for Linux
This package adds ZFS to the system initramfs with a hook
for the initramfs-tools infrastructure.
-Package: zfsutils
+Package: zfsutils-linux
Section: admin
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -113,6 +113,7 @@ Recommends: lsb-base, zfs-modules | zfs-dkms
Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs
Conflicts: zfs, zfs-fuse
Replaces: zfs
+Provides: zfsutils
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
@@ -125,16 +126,16 @@ Package: zfs-dbg
Section: debug
Priority: extra
Architecture: linux-any
-Depends: libnvpair1 (= ${binary:Version}),
- libuutil1 (= ${binary:Version}),
- libzfs2 (= ${binary:Version}),
- libzpool1 (= ${binary:Version}),
+Depends: libnvpair1linux (= ${binary:Version}),
+ libuutil1linux (= ${binary:Version}),
+ libzfs2linux (= ${binary:Version}),
+ libzpool1linux (= ${binary:Version}),
${misc:Depends}
-Recommends: zfsutils (= ${binary:Version})
+Recommends: zfsutils-linux (= ${binary:Version})
Description: Debugging symbols for ZFS userland libraries and tools
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 libzpoo1, libzfs2,
- libnvpair1, libuutil1, and zfsutils.
+ This package contains the debugging symbols for libzpoo1linux, libzfs2linux,
+ libnvpair1linux, libuutil1linux, and zfsutils-linux.
diff --git a/debian/libnvpair1-udeb.install b/debian/libnvpair1linux-udeb.install
similarity index 100%
rename from debian/libnvpair1-udeb.install
rename to debian/libnvpair1linux-udeb.install
diff --git a/debian/libnvpair1.docs b/debian/libnvpair1linux.docs
similarity index 100%
rename from debian/libnvpair1.docs
rename to debian/libnvpair1linux.docs
diff --git a/debian/libnvpair1.install b/debian/libnvpair1linux.install
similarity index 100%
rename from debian/libnvpair1.install
rename to debian/libnvpair1linux.install
diff --git a/debian/libuutil1-udeb.install b/debian/libuutil1linux-udeb.install
similarity index 100%
rename from debian/libuutil1-udeb.install
rename to debian/libuutil1linux-udeb.install
diff --git a/debian/libuutil1.docs b/debian/libuutil1linux.docs
similarity index 100%
rename from debian/libuutil1.docs
rename to debian/libuutil1linux.docs
diff --git a/debian/libuutil1.install b/debian/libuutil1linux.install
similarity index 100%
rename from debian/libuutil1.install
rename to debian/libuutil1linux.install
diff --git a/debian/libzfs2-udeb.install b/debian/libzfs2linux-udeb.install
similarity index 100%
rename from debian/libzfs2-udeb.install
rename to debian/libzfs2linux-udeb.install
diff --git a/debian/libzfs-dev.docs b/debian/libzfs2linux.docs
similarity index 100%
rename from debian/libzfs-dev.docs
rename to debian/libzfs2linux.docs
diff --git a/debian/libzfs2.install b/debian/libzfs2linux.install
similarity index 100%
rename from debian/libzfs2.install
rename to debian/libzfs2linux.install
diff --git a/debian/libzfs2.docs b/debian/libzfslinux-dev.docs
similarity index 100%
rename from debian/libzfs2.docs
rename to debian/libzfslinux-dev.docs
diff --git a/debian/libzfs-dev.install b/debian/libzfslinux-dev.install
similarity index 100%
rename from debian/libzfs-dev.install
rename to debian/libzfslinux-dev.install
diff --git a/debian/libzpool1-udeb.install b/debian/libzpool1linux-udeb.install
similarity index 100%
rename from debian/libzpool1-udeb.install
rename to debian/libzpool1linux-udeb.install
diff --git a/debian/libzpool1.docs b/debian/libzpool1linux.docs
similarity index 100%
rename from debian/libzpool1.docs
rename to debian/libzpool1linux.docs
diff --git a/debian/libzpool1.install b/debian/libzpool1linux.install
similarity index 100%
rename from debian/libzpool1.install
rename to debian/libzpool1linux.install
diff --git a/debian/zfsutils-udeb.install b/debian/zfsutils-linux-udeb.install
similarity index 100%
rename from debian/zfsutils-udeb.install
rename to debian/zfsutils-linux-udeb.install
diff --git a/debian/zfsutils-udeb.isinstallable b/debian/zfsutils-linux-udeb.isinstallable
similarity index 100%
rename from debian/zfsutils-udeb.isinstallable
rename to debian/zfsutils-linux-udeb.isinstallable
diff --git a/debian/zfsutils.docs b/debian/zfsutils-linux.docs
similarity index 100%
rename from debian/zfsutils.docs
rename to debian/zfsutils-linux.docs
diff --git a/debian/zfsutils.examples b/debian/zfsutils-linux.examples
similarity index 100%
rename from debian/zfsutils.examples
rename to debian/zfsutils-linux.examples
diff --git a/debian/zfsutils.install b/debian/zfsutils-linux.install
similarity index 100%
rename from debian/zfsutils.install
rename to debian/zfsutils-linux.install
diff --git a/debian/zfsutils.postinst b/debian/zfsutils-linux.postinst
similarity index 100%
rename from debian/zfsutils.postinst
rename to debian/zfsutils-linux.postinst
diff --git a/debian/zfsutils.postrm b/debian/zfsutils-linux.postrm
similarity index 100%
rename from debian/zfsutils.postrm
rename to debian/zfsutils-linux.postrm
diff --git a/debian/zfsutils.preinst b/debian/zfsutils-linux.preinst
similarity index 100%
rename from debian/zfsutils.preinst
rename to debian/zfsutils-linux.preinst
diff --git a/debian/zfsutils.zfs-mount.init b/debian/zfsutils-linux.zfs-mount.init
similarity index 100%
rename from debian/zfsutils.zfs-mount.init
rename to debian/zfsutils-linux.zfs-mount.init
diff --git a/debian/zfsutils.zfs-share.init b/debian/zfsutils-linux.zfs-share.init
similarity index 100%
rename from debian/zfsutils.zfs-share.init
rename to debian/zfsutils-linux.zfs-share.init
diff --git a/debian/zfsutils.zfs.default b/debian/zfsutils-linux.zfs.default
similarity index 100%
rename from debian/zfsutils.zfs.default
rename to debian/zfsutils-linux.zfs.default
--
ZFS on Linux
More information about the Pkg-zfsonlinux-devel
mailing list