[pve-devel] [PATCH zfsonlinux 2/6] Bump SONAME to libzfs7 and libzpool7

[Stoiko Ivanov <s.ivanov@proxmox.com>]

follows debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs
2d9f5b6dc ("Bump SONAME to libzfs7 and libzpool7").

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
 Makefile                                      |  4 ++--
 debian/control                                | 19 ++++++++++---------
 .../{libzfs6linux.docs => libzfs7linux.docs}  |  0
 ...nux.install.in => libzfs7linux.install.in} |  0
 ...errides => libzfs7linux.lintian-overrides} |  0
 ...ibzfs6linux.postrm => libzfs7linux.postrm} |  0
 ...zfs6linux.preinst => libzfs7linux.preinst} |  0
 ...ibzpool6linux.docs => libzpool7linux.docs} |  0
 ...x.install.in => libzpool7linux.install.in} |  0
 ...rides => libzpool7linux.lintian-overrides} |  0
 10 files changed, 12 insertions(+), 11 deletions(-)
 rename debian/{libzfs6linux.docs => libzfs7linux.docs} (100%)
 rename debian/{libzfs6linux.install.in => libzfs7linux.install.in} (100%)
 rename debian/{libzfs6linux.lintian-overrides => libzfs7linux.lintian-overrides} (100%)
 rename debian/{libzfs6linux.postrm => libzfs7linux.postrm} (100%)
 rename debian/{libzfs6linux.preinst => libzfs7linux.preinst} (100%)
 rename debian/{libzpool6linux.docs => libzpool7linux.docs} (100%)
 rename debian/{libzpool6linux.install.in => libzpool7linux.install.in} (100%)
 rename debian/{libzpool6linux.lintian-overrides => libzpool7linux.lintian-overrides} (100%)

diff --git a/Makefile b/Makefile
index 4f27fca07..96857f5dc 100644
--- a/Makefile
+++ b/Makefile
@@ -12,9 +12,9 @@ ZFS_DEB1= libnvpair3linux_$(DEB_VERSION)_amd64.deb
 ZFS_DEB_BINARY =				\
 libpam-zfs_$(DEB_VERSION)_amd64.deb		\
 libuutil3linux_$(DEB_VERSION)_amd64.deb		\
-libzfs6linux_$(DEB_VERSION)_amd64.deb		\
+libzfs7linux_$(DEB_VERSION)_amd64.deb		\
 libzfsbootenv1linux_$(DEB_VERSION)_amd64.deb	\
-libzpool6linux_$(DEB_VERSION)_amd64.deb		\
+libzpool7linux_$(DEB_VERSION)_amd64.deb		\
 zfs-test_$(DEB_VERSION)_amd64.deb			\
 zfsutils-linux_$(DEB_VERSION)_amd64.deb		\
 zfs-zed_$(DEB_VERSION)_amd64.deb
diff --git a/debian/control b/debian/control
index 9e70a51c4..de6770162 100644
--- a/debian/control
+++ b/debian/control
@@ -78,9 +78,9 @@ Depends: libblkid-dev,
          libssl-dev | libssl1.0-dev,
          libtirpc-dev,
          libuutil3linux (= ${binary:Version}),
-         libzfs6linux (= ${binary:Version}),
+         libzfs7linux (= ${binary:Version}),
          libzfsbootenv1linux (= ${binary:Version}),
-         libzpool6linux (= ${binary:Version}),
+         libzpool7linux (= ${binary:Version}),
          zlib1g-dev,
          ${misc:Depends},
 Provides: libnvpair-dev, libuutil-dev,
@@ -89,9 +89,9 @@ Description: OpenZFS filesystem development files for Linux
  libraries of OpenZFS filesystem.
  .
  This package includes the development files of libnvpair3, libuutil3,
- libzpool6 and libzfs6, libzfsbootenv1.
+ libzpool7 and libzfs7, libzfsbootenv1.
 
-Package: libzfs6linux
+Package: libzfs7linux
 Section: contrib/libs
 Architecture: linux-any
 Multi-Arch: same
@@ -99,8 +99,9 @@ Depends: ${misc:Depends}, ${shlibs:Depends},
 # The libcurl4 is loaded through dlopen("libcurl.so.4").
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=988521
 Recommends: libcurl4,
-Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux,
-Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux,
+# libzfs_core.so.3 is installed by libzfs7linux, so we need breaks/replaces
+Breaks: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux, libzfs6linux,
+Replaces: libzfs2, libzfs2linux, libzfs3linux, libzfs4, libzfs4linux, libzfs6linux,
 Description: OpenZFS filesystem library for Linux - general support
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
@@ -122,13 +123,13 @@ Description: OpenZFS filesystem library for Linux
  .
  The zfsbootenv library provides support for modifying ZFS label information.
 
-Package: libzpool6linux
+Package: libzpool7linux
 Section: contrib/libs
 Architecture: linux-any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends},
-Breaks: libzpool2, libzpool2linux, libzpool3linux, libzpool4, libzpool5linux,
-Replaces: libzpool2, libzpool2linux, libzpool3linux, libzpool4, libzpool5linux,
+Breaks: libzpool2, libzpool5
+Replaces: libzpool2, libzpool5
 Description: OpenZFS pool library for Linux
  OpenZFS is a storage platform that encompasses the functionality of
  traditional filesystems and volume managers. It supports data checksums,
diff --git a/debian/libzfs6linux.docs b/debian/libzfs7linux.docs
similarity index 100%
rename from debian/libzfs6linux.docs
rename to debian/libzfs7linux.docs
diff --git a/debian/libzfs6linux.install.in b/debian/libzfs7linux.install.in
similarity index 100%
rename from debian/libzfs6linux.install.in
rename to debian/libzfs7linux.install.in
diff --git a/debian/libzfs6linux.lintian-overrides b/debian/libzfs7linux.lintian-overrides
similarity index 100%
rename from debian/libzfs6linux.lintian-overrides
rename to debian/libzfs7linux.lintian-overrides
diff --git a/debian/libzfs6linux.postrm b/debian/libzfs7linux.postrm
similarity index 100%
rename from debian/libzfs6linux.postrm
rename to debian/libzfs7linux.postrm
diff --git a/debian/libzfs6linux.preinst b/debian/libzfs7linux.preinst
similarity index 100%
rename from debian/libzfs6linux.preinst
rename to debian/libzfs7linux.preinst
diff --git a/debian/libzpool6linux.docs b/debian/libzpool7linux.docs
similarity index 100%
rename from debian/libzpool6linux.docs
rename to debian/libzpool7linux.docs
diff --git a/debian/libzpool6linux.install.in b/debian/libzpool7linux.install.in
similarity index 100%
rename from debian/libzpool6linux.install.in
rename to debian/libzpool7linux.install.in
diff --git a/debian/libzpool6linux.lintian-overrides b/debian/libzpool7linux.lintian-overrides
similarity index 100%
rename from debian/libzpool6linux.lintian-overrides
rename to debian/libzpool7linux.lintian-overrides
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel