[pbs-devel] [PATCH proxmox-backup stable-3 2/2] build: Adapt from pbs2to3 to pbs3to4

[Christian Ebner]

Build and package the new version of the upgrade check binary,
dropping the no longer required old one.

Signed-off-by: Christian Ebner <c.ebner at proxmox.com>
---
 Makefile                             | 4 ++--
 debian/lintian-overrides             | 2 +-
 debian/proxmox-backup-server.install | 4 ++--
 docs/Makefile                        | 2 +-
 docs/conf.py                         | 2 +-
 docs/{pbs2to3 => pbs3to4}/man1.rst   | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename docs/{pbs2to3 => pbs3to4}/man1.rst (98%)

diff --git a/Makefile b/Makefile
index f14b4d8ce..2012ae5d2 100644
--- a/Makefile
+++ b/Makefile
@@ -195,7 +195,7 @@ $(COMPILED_BINS) $(COMPILEDIR)/dump-catalog-shell-cli $(COMPILEDIR)/docgen &:
 	    --bin proxmox-restore-daemon \
 	    --package proxmox-backup \
 	    --bin docgen \
-	    --bin pbs2to3 \
+	    --bin pbs3to4 \
 	    --bin proxmox-backup-api \
 	    --bin proxmox-backup-manager \
 	    --bin proxmox-backup-proxy \
@@ -233,7 +233,7 @@ install: $(COMPILED_BINS) $(STATIC_BINS)
 	$(foreach i,$(USR_SBIN), \
 	    install -m755 $(COMPILEDIR)/$(i) $(DESTDIR)$(SBINDIR)/ ; \
 	    install -m644 zsh-completions/_$(i) $(DESTDIR)$(ZSH_COMPL_DEST)/ ;)
-	install -m755 $(COMPILEDIR)/pbs2to3 $(DESTDIR)$(SBINDIR)/
+	install -m755 $(COMPILEDIR)/pbs3to4 $(DESTDIR)$(SBINDIR)/
 	install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup
 	install -dm755 $(DESTDIR)$(LIBEXECDIR)/proxmox-backup/file-restore
 	$(foreach i,$(RESTORE_BIN), \
diff --git a/debian/lintian-overrides b/debian/lintian-overrides
index d3389d103..cb57e72d9 100644
--- a/debian/lintian-overrides
+++ b/debian/lintian-overrides
@@ -4,5 +4,5 @@ proxmox-backup-server: elevated-privileges 4755 root/root [usr/lib/x86_64-linux-
 proxmox-backup-server: systemd-service-file-refers-to-unusual-wantedby-target getty.target [lib/systemd/system/proxmox-backup-banner.service]
 proxmox-backup-server: uses-dpkg-database-directly [usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api]
 proxmox-backup-server: uses-dpkg-database-directly [usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy]
-proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/pbs2to3]
+proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/pbs3to4]
 proxmox-backup-server: uses-dpkg-database-directly [usr/sbin/proxmox-backup-debug]
diff --git a/debian/proxmox-backup-server.install b/debian/proxmox-backup-server.install
index 71b185be4..4deaab586 100644
--- a/debian/proxmox-backup-server.install
+++ b/debian/proxmox-backup-server.install
@@ -13,14 +13,14 @@ usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-banner
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-daily-update
 usr/lib/x86_64-linux-gnu/proxmox-backup/sg-tape-cmd
-usr/sbin/pbs2to3
+usr/sbin/pbs3to4
 usr/sbin/proxmox-backup-debug
 usr/sbin/proxmox-backup-manager
 usr/share/javascript/proxmox-backup/css/ext6-pbs.css
 usr/share/javascript/proxmox-backup/images
 usr/share/javascript/proxmox-backup/index.hbs
 usr/share/javascript/proxmox-backup/js/proxmox-backup-gui.js
-usr/share/man/man1/pbs2to3.1
+usr/share/man/man1/pbs3to4.1
 usr/share/man/man1/pmt.1
 usr/share/man/man1/pmtx.1
 usr/share/man/man1/proxmox-backup-debug.1
diff --git a/docs/Makefile b/docs/Makefile
index c57cbbc2d..5cf5fc179 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -25,7 +25,7 @@ GENERATED_SYNOPSIS := 						\
 	pxar/synopsis.rst					\
 
 MAN1_PAGES := 				\
-	pbs2to3.1			\
+	pbs3to4.1			\
 	pmt.1				\
 	pmtx.1				\
 	proxmox-backup-client.1		\
diff --git a/docs/conf.py b/docs/conf.py
index a7fa10798..64c4f9d47 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -102,7 +102,7 @@ man_pages = [
     ('pxar/man1', 'pxar', 'Proxmox File Archive CLI Tool', [author], 1),
     ('pmt/man1', 'pmt', 'Control Linux Tape Devices', [author], 1),
     ('pmtx/man1', 'pmtx', 'Control SCSI media changer devices (tape autoloaders)', [author], 1),
-    ('pbs2to3/man1', 'pbs2to3', 'Proxmox Backup Server upgrade checker script for 2.4+ to current 3.x major upgrades', [author], 1),
+    ('pbs3to4/man1', 'pbs3to4', 'Proxmox Backup Server upgrade checker script for 3.4+ to current 4.x major upgrades', [author], 1),
     # configs
     ('config/acl/man5', 'acl.cfg', 'Access Control Configuration', [author], 5),
     ('config/datastore/man5', 'datastore.cfg', 'Datastore Configuration', [author], 5),
diff --git a/docs/pbs2to3/man1.rst b/docs/pbs3to4/man1.rst
similarity index 98%
rename from docs/pbs2to3/man1.rst
rename to docs/pbs3to4/man1.rst
index bef29d223..fdcc410fc 100644
--- a/docs/pbs2to3/man1.rst
+++ b/docs/pbs3to4/man1.rst
@@ -2,7 +2,7 @@
 
 
 =======
-pbs2to3
+pbs3to4
 =======
 
 Description
-- 
2.39.5