[pve-devel] [PATCH zfsonlinux 3/6] d/: rename arcstat and arc_summary to zarcstat and zarcsummary

[Stoiko Ivanov]

follows debian-upstream https://salsa.debian.org/zfsonlinux-team/zfs
519efec9d ("d/: rename arcstat and arc_summary to zarcstat and zarcsummary, no longer conflicts with nordugrid-arc-client")
and
5af292abd ("d/copyright: fix patterns according to filename changes")

Signed-off-by: Stoiko Ivanov <s.ivanov at proxmox.com>
---
 debian/control                          | 2 +-
 debian/copyright                        | 4 ++--
 debian/zfsutils-linux.install           | 8 ++++----
 debian/zfsutils-linux.links             | 1 -
 debian/zfsutils-linux.lintian-overrides | 4 ++--
 5 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/control b/debian/control
index de6770162..8e3c23e37 100644
--- a/debian/control
+++ b/debian/control
@@ -215,7 +215,7 @@ Architecture: linux-any
 Depends: python3, ${misc:Depends}, ${shlibs:Depends},
 Recommends: zfs-zed,
 Suggests: nfs-kernel-server, samba-common-bin (>= 3.0.23), zfs-initramfs,
-Conflicts: zfs, zfs-fuse, nordugrid-arc-client
+Conflicts: zfs, zfs-fuse
 Provides: zfsutils,
 Description: command-line tools to manage OpenZFS filesystems
  OpenZFS is a storage platform that encompasses the functionality of
diff --git a/debian/copyright b/debian/copyright
index 71c85d53c..ef81e9e06 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -37,7 +37,7 @@ Copyright: 2011, 2013, Nexenta Systems, Inc.
            2007, 2009, Sun Microsystems, Inc.
 License: CDDL-1.0
 
-Files: cmd/arc_summary
+Files: cmd/zarcsummary
 Copyright:
   2010, 2011, Jason J. Hellenthal <jhell at DataIX.net>
   2010, Martin Matuska <mm at FreeBSD.org>
@@ -45,7 +45,7 @@ Copyright:
   2017, Scot W. Stevenson <scot.stevenson at gmail.com>
 License: BSD-2-clause
 
-Files: cmd/arcstat.in
+Files: cmd/zarcstat.in
 Source: http://github.com/mharsch/arcstat
 Copyright:
   2007, Oracle and/or its affiliates.
diff --git a/debian/zfsutils-linux.install b/debian/zfsutils-linux.install
index 5a5284027..22b403f8f 100644
--- a/debian/zfsutils-linux.install
+++ b/debian/zfsutils-linux.install
@@ -29,9 +29,9 @@ usr/lib/udev/
 usr/lib/zfs-linux/zfs_prepare_disk
 usr/lib/zfs-linux/zpool.d/
 usr/lib/zfs-linux/zpool_influxdb
-usr/bin/arc_summary
-usr/bin/arcstat usr/sbin
-usr/bin/dbufstat usr/sbin
+usr/bin/zarcsummary
+usr/bin/zarcstat
+usr/bin/dbufstat
 usr/sbin/fsck.zfs
 usr/sbin/mount.zfs
 usr/sbin/zdb
@@ -43,6 +43,7 @@ usr/sbin/zpool
 usr/sbin/zstream
 usr/sbin/zstreamdump
 usr/share/bash-completion/completions
+usr/share/man/man1/zarcstat.1
 usr/share/man/man1/zhack.1
 usr/share/man/man1/zvol_wait.1
 usr/share/man/man4/spl.4
@@ -54,7 +55,6 @@ usr/share/man/man7/zfsprops.7
 usr/share/man/man7/zpool-features.7
 usr/share/man/man7/zpoolconcepts.7
 usr/share/man/man7/zpoolprops.7
-usr/share/man/man8/arcstat.8
 usr/share/man/man8/fsck.zfs.8
 usr/share/man/man8/mount.zfs.8
 usr/share/man/man8/vdev_id.8
diff --git a/debian/zfsutils-linux.links b/debian/zfsutils-linux.links
index 3c3fc442b..bb2454916 100644
--- a/debian/zfsutils-linux.links
+++ b/debian/zfsutils-linux.links
@@ -1,6 +1,5 @@
 usr/sbin/zfs      usr/bin/zfs
 usr/sbin/zpool    usr/bin/zpool
 usr/lib/zfs-linux/zpool_influxdb  usr/bin/zpool_influxdb
-usr/bin/arc_summary  usr/sbin/arc_summary
 usr/bin/zilstat      usr/sbin/zilstat
 usr/bin/zvol_wait    usr/sbin/zvol_wait
diff --git a/debian/zfsutils-linux.lintian-overrides b/debian/zfsutils-linux.lintian-overrides
index 3cc548e88..9cbdc4e76 100644
--- a/debian/zfsutils-linux.lintian-overrides
+++ b/debian/zfsutils-linux.lintian-overrides
@@ -1,7 +1,7 @@
 spare-manual-page
 systemd-service-file-refers-to-unusual-wantedby-target
-no-manual-page [usr/sbin/dbufstat]
-no-manual-page [usr/sbin/arc_summary]
+no-manual-page [usr/bin/dbufstat]
+no-manual-page [usr/bin/zarcsummary]
 no-manual-page [usr/sbin/zilstat]
 groff-message
 appstream-metadata-missing-modalias-provide
-- 
2.47.3