From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <s.ivanov@proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 1E16F61382
for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:44 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 8C3771FFE3
for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:43 +0100 (CET)
Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com
[212.186.127.180])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id C93011FCD1
for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:35 +0100 (CET)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 8FF3644C49
for <pve-devel@lists.proxmox.com>; Wed, 2 Dec 2020 20:18:35 +0100 (CET)
From: Stoiko Ivanov <s.ivanov@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Wed, 2 Dec 2020 20:18:03 +0100
Message-Id: <20201202191809.13270-5-s.ivanov@proxmox.com>
X-Mailer: git-send-email 2.20.1
In-Reply-To: <20201202191809.13270-1-s.ivanov@proxmox.com>
References: <20201202191809.13270-1-s.ivanov@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.084 Adjusted score from AWL reputation of From: address
KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/,
medium trust
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [libuutil1linux.docs, libuutil2linux.docs, libnvpair1linux.docs,
install.in, libnvpair2linux.docs, libzfs2linux.docs, proxmox.com,
libzfs3linux.docs, libzpool2linux.docs, zfsonlinux.org, libzpool3linux.docs]
Subject: [pve-devel] [PATCH zfsonlinux 3/9] Bump libz{fs, pool,
uutil} soname version
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 02 Dec 2020 19:18:44 -0000
adapted from debian-upstream 490ecc37abc7f6759293b90334768d088f2ff98c
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---
Makefile | 8 ++--
debian/control | 48 +++++++++----------
debian/libnvpair1linux.lintian-overrides | 1 -
...nvpair1linux.docs => libnvpair2linux.docs} | 0
....install.in => libnvpair2linux.install.in} | 0
debian/libnvpair2linux.lintian-overrides | 1 +
debian/libuutil1linux.lintian-overrides | 1 -
...ibuutil1linux.docs => libuutil2linux.docs} | 0
...x.install.in => libuutil2linux.install.in} | 0
debian/libuutil2linux.lintian-overrides | 1 +
debian/libzfs2linux.lintian-overrides | 1 -
.../{libzfs2linux.docs => libzfs3linux.docs} | 0
...nux.install.in => libzfs3linux.install.in} | 0
debian/libzfs3linux.lintian-overrides | 1 +
debian/libzpool2linux.lintian-overrides | 1 -
...ibzpool2linux.docs => libzpool3linux.docs} | 0
...x.install.in => libzpool3linux.install.in} | 0
debian/libzpool3linux.lintian-overrides | 1 +
18 files changed, 32 insertions(+), 32 deletions(-)
delete mode 100644 debian/libnvpair1linux.lintian-overrides
rename debian/{libnvpair1linux.docs => libnvpair2linux.docs} (100%)
rename debian/{libnvpair1linux.install.in => libnvpair2linux.install.in} (100%)
create mode 100644 debian/libnvpair2linux.lintian-overrides
delete mode 100644 debian/libuutil1linux.lintian-overrides
rename debian/{libuutil1linux.docs => libuutil2linux.docs} (100%)
rename debian/{libuutil1linux.install.in => libuutil2linux.install.in} (100%)
create mode 100644 debian/libuutil2linux.lintian-overrides
delete mode 100644 debian/libzfs2linux.lintian-overrides
rename debian/{libzfs2linux.docs => libzfs3linux.docs} (100%)
rename debian/{libzfs2linux.install.in => libzfs3linux.install.in} (100%)
create mode 100644 debian/libzfs3linux.lintian-overrides
delete mode 100644 debian/libzpool2linux.lintian-overrides
rename debian/{libzpool2linux.docs => libzpool3linux.docs} (100%)
rename debian/{libzpool2linux.install.in => libzpool3linux.install.in} (100%)
create mode 100644 debian/libzpool3linux.lintian-overrides
diff --git a/Makefile b/Makefile
index 0da7c7ae..e0dad3a6 100644
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,12 @@ ZFSPKGVER != dpkg-parsechangelog -l ${ZFSPKG}/changelog -Sversion
ZFSDIR=zfs-linux_${ZFSVER}
ZFSSRC=upstream
-ZFS_DEB1= libnvpair1linux_${ZFSPKGVER}_amd64.deb
+ZFS_DEB1= libnvpair2linux_${ZFSPKGVER}_amd64.deb
ZFS_DEB2= \
-libuutil1linux_${ZFSPKGVER}_amd64.deb \
-libzfs2linux_${ZFSPKGVER}_amd64.deb \
+libuutil2linux_${ZFSPKGVER}_amd64.deb \
+libzfs3linux_${ZFSPKGVER}_amd64.deb \
libzfslinux-dev_${ZFSPKGVER}_amd64.deb \
-libzpool2linux_${ZFSPKGVER}_amd64.deb \
+libzpool3linux_${ZFSPKGVER}_amd64.deb \
zfs-dbg_${ZFSPKGVER}_amd64.deb \
zfs-zed_${ZFSPKGVER}_amd64.deb \
zfs-initramfs_${ZFSPKGVER}_all.deb \
diff --git a/debian/control b/debian/control
index 422b2c52..72217981 100644
--- a/debian/control
+++ b/debian/control
@@ -19,23 +19,23 @@ Homepage: https://www.zfsonlinux.org/
Vcs-Git: https://git.proxmox.com/git/zfsonlinux.git
Vcs-Browser: https://git.proxmox.com/?p=zfsonlinux.git;a=summary
-Package: libnvpair1linux
+Package: libnvpair2linux
Section: contrib/libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libnvpair1
-Replaces: libnvpair1
+Breaks: libnvpair1, libnvpair1linux
+Replaces: libnvpair1, libnvpair1linux
Description: Solaris name-value library for Linux
This library provides routines for packing and unpacking nv pairs for
transporting data across process boundaries, transporting between
kernel and userland, and possibly saving onto disk files.
-Package: libuutil1linux
+Package: libuutil2linux
Section: contrib/libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libuutil1
-Replaces: libuutil1
+Breaks: libuutil1, libuutil1linux
+Replaces: libuutil1, libuutil1linux
Description: Solaris userland utility library for Linux
This library provides a variety of glue functions for ZFS on Linux:
* libspl: The Solaris Porting Layer userland library, which provides APIs
@@ -50,25 +50,25 @@ Description: Solaris userland utility library for Linux
Package: libzfslinux-dev
Section: contrib/libdevel
Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
- libuutil1linux (= ${binary:Version}),
- libzfs2linux (= ${binary:Version}),
- libzpool2linux (= ${binary:Version}),
+Depends: libnvpair2linux (= ${binary:Version}),
+ libuutil2linux (= ${binary:Version}),
+ libzfs3linux (= ${binary:Version}),
+ libzpool3linux (= ${binary:Version}),
${misc:Depends}
Provides: libnvpair-dev, libuutil-dev
Description: OpenZFS filesystem development files for Linux
Header files and static libraries for compiling software against
libraries of OpenZFS filesystem.
.
- This package includes the development files of libnvpair1, libuutil1,
- libzpool2 and libzfs2.
+ This package includes the development files of libnvpair2, libuutil2,
+ libzpool3 and libzfs3.
-Package: libzfs2linux
+Package: libzfs3linux
Section: contrib/libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzfs2
-Replaces: libzfs2
+Breaks: libzfs2, libzfs2linux
+Replaces: libzfs2, libzfs2linux
Description: OpenZFS filesystem library for Linux
OpenZFS is a storage platform that encompasses the functionality of
traditional filesystems and volume managers. It supports data checksums,
@@ -76,12 +76,12 @@ Description: OpenZFS filesystem library for Linux
.
The OpenZFS library provides support for managing OpenZFS filesystems.
-Package: libzpool2linux
+Package: libzpool3linux
Section: contrib/libs
Architecture: linux-any
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libzpool2
-Replaces: libzpool2
+Breaks: libzpool2, libzpool2linux
+Replaces: libzpool2, libzpool2linux
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,
@@ -216,10 +216,10 @@ Package: zfs-dbg
Section: contrib/debug
Priority: optional
Architecture: linux-any
-Depends: libnvpair1linux (= ${binary:Version}),
- libuutil1linux (= ${binary:Version}),
- libzfs2linux (= ${binary:Version}),
- libzpool2linux (= ${binary:Version}),
+Depends: libnvpair2linux (= ${binary:Version}),
+ libuutil2linux (= ${binary:Version}),
+ libzfs3linux (= ${binary:Version}),
+ libzpool3linux (= ${binary:Version}),
zfs-zed (= ${binary:Version}),
zfsutils-linux (= ${binary:Version}),
${misc:Depends}
@@ -228,8 +228,8 @@ Description: Debugging symbols for OpenZFS userland libraries and tools
traditional filesystems and volume managers. It supports data checksums,
compression, encryption, snapshots, and more.
.
- This package contains the debugging symbols for libzpool2linux, libzfs2linux,
- libnvpair1linux, libuutil1linux, zfs-zed and zfsutils-linux.
+ This package contains the debugging symbols for libzpool3linux, libzfs3linux,
+ libnvpair2linux, libuutil2linux, zfs-zed and zfsutils-linux.
Package: spl
Section: contrib/metapackages
diff --git a/debian/libnvpair1linux.lintian-overrides b/debian/libnvpair1linux.lintian-overrides
deleted file mode 100644
index cf912234..00000000
--- a/debian/libnvpair1linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libnvpair1linux: package-name-doesnt-match-sonames
diff --git a/debian/libnvpair1linux.docs b/debian/libnvpair2linux.docs
similarity index 100%
rename from debian/libnvpair1linux.docs
rename to debian/libnvpair2linux.docs
diff --git a/debian/libnvpair1linux.install.in b/debian/libnvpair2linux.install.in
similarity index 100%
rename from debian/libnvpair1linux.install.in
rename to debian/libnvpair2linux.install.in
diff --git a/debian/libnvpair2linux.lintian-overrides b/debian/libnvpair2linux.lintian-overrides
new file mode 100644
index 00000000..ad4f1dfa
--- /dev/null
+++ b/debian/libnvpair2linux.lintian-overrides
@@ -0,0 +1 @@
+libnvpair2linux: package-name-doesnt-match-sonames
diff --git a/debian/libuutil1linux.lintian-overrides b/debian/libuutil1linux.lintian-overrides
deleted file mode 100644
index 058b0db3..00000000
--- a/debian/libuutil1linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libuutil1linux: package-name-doesnt-match-sonames
diff --git a/debian/libuutil1linux.docs b/debian/libuutil2linux.docs
similarity index 100%
rename from debian/libuutil1linux.docs
rename to debian/libuutil2linux.docs
diff --git a/debian/libuutil1linux.install.in b/debian/libuutil2linux.install.in
similarity index 100%
rename from debian/libuutil1linux.install.in
rename to debian/libuutil2linux.install.in
diff --git a/debian/libuutil2linux.lintian-overrides b/debian/libuutil2linux.lintian-overrides
new file mode 100644
index 00000000..30f7d718
--- /dev/null
+++ b/debian/libuutil2linux.lintian-overrides
@@ -0,0 +1 @@
+libuutil2linux: package-name-doesnt-match-sonames
diff --git a/debian/libzfs2linux.lintian-overrides b/debian/libzfs2linux.lintian-overrides
deleted file mode 100644
index a2a9d100..00000000
--- a/debian/libzfs2linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzfs2linux: package-name-doesnt-match-sonames
diff --git a/debian/libzfs2linux.docs b/debian/libzfs3linux.docs
similarity index 100%
rename from debian/libzfs2linux.docs
rename to debian/libzfs3linux.docs
diff --git a/debian/libzfs2linux.install.in b/debian/libzfs3linux.install.in
similarity index 100%
rename from debian/libzfs2linux.install.in
rename to debian/libzfs3linux.install.in
diff --git a/debian/libzfs3linux.lintian-overrides b/debian/libzfs3linux.lintian-overrides
new file mode 100644
index 00000000..0630b2dd
--- /dev/null
+++ b/debian/libzfs3linux.lintian-overrides
@@ -0,0 +1 @@
+libzfs3linux: package-name-doesnt-match-sonames
diff --git a/debian/libzpool2linux.lintian-overrides b/debian/libzpool2linux.lintian-overrides
deleted file mode 100644
index 41a444f0..00000000
--- a/debian/libzpool2linux.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libzpool2linux: package-name-doesnt-match-sonames
diff --git a/debian/libzpool2linux.docs b/debian/libzpool3linux.docs
similarity index 100%
rename from debian/libzpool2linux.docs
rename to debian/libzpool3linux.docs
diff --git a/debian/libzpool2linux.install.in b/debian/libzpool3linux.install.in
similarity index 100%
rename from debian/libzpool2linux.install.in
rename to debian/libzpool3linux.install.in
diff --git a/debian/libzpool3linux.lintian-overrides b/debian/libzpool3linux.lintian-overrides
new file mode 100644
index 00000000..09f8fa21
--- /dev/null
+++ b/debian/libzpool3linux.lintian-overrides
@@ -0,0 +1 @@
+libzpool3linux: package-name-doesnt-match-sonames
--
2.20.1