debian: normalize packaging files with wrap-and-sort -tkn

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

debian/control

@@ -1,158 +1,158 @@
 Source: rust-proxmox-backup
 Section: admin
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
+Build-Depends: bash-completion,
- dh-cargo (>= 24),
+               cargo:native (>= 0.65.0~),
- cargo:native (>= 0.65.0~),
+               debhelper (>= 12~),
- rustc:native,
+               debhelper-compat (= 13),
- libstd-rust-dev,
+               dh-cargo (>= 24),
- librust-anyhow-1+default-dev,
+               fonts-dejavu-core <!nodoc>,
- librust-apt-pkg-native-0.3+default-dev (>= 0.3.2-~~),
+               fonts-lato <!nodoc>,
- librust-base64-0.13+default-dev,
+               fonts-open-sans <!nodoc>,
- librust-bitflags-1+default-dev (>= 1.2.1-~~),
+               graphviz <!nodoc>,
- librust-bytes-1+default-dev,
+               jq,
- librust-cidr-0.2+default-dev (>= 0.2.1-~~),
+               latexmk <!nodoc>,
- librust-crc32fast-1+default-dev,
+               libacl1-dev,
- librust-crossbeam-channel-0.5+default-dev,
+               libfuse3-dev,
- librust-endian-trait-0.6+arrays-dev,
+               librust-anyhow-1+default-dev,
- librust-endian-trait-0.6+default-dev,
+               librust-apt-pkg-native-0.3+default-dev (>= 0.3.2-~~),
- librust-env-logger-0.9+default-dev,
+               librust-base64-0.13+default-dev,
- librust-flate2-1+default-dev,
+               librust-bitflags-1+default-dev (>= 1.2.1-~~),
- librust-foreign-types-0.3+default-dev,
+               librust-bytes-1+default-dev,
- librust-futures-0.3+default-dev,
+               librust-cidr-0.2+default-dev (>= 0.2.1-~~),
- librust-h2-0.3+default-dev,
+               librust-crc32fast-1+default-dev,
- librust-h2-0.3+stream-dev,
+               librust-crossbeam-channel-0.5+default-dev,
- librust-handlebars-3+default-dev,
+               librust-endian-trait-0.6+arrays-dev,
- librust-hex-0.4+default-dev (>= 0.4.3-~~),
+               librust-endian-trait-0.6+default-dev,
- librust-hex-0.4+serde-dev (>= 0.4.3-~~),
+               librust-env-logger-0.9+default-dev,
- librust-http-0.2+default-dev,
+               librust-flate2-1+default-dev,
- librust-hyper-0.14+default-dev,
+               librust-foreign-types-0.3+default-dev,
- librust-hyper-0.14+full-dev,
+               librust-futures-0.3+default-dev,
- librust-lazy-static-1+default-dev (>= 1.4-~~),
+               librust-h2-0.3+default-dev,
- librust-libc-0.2+default-dev,
+               librust-h2-0.3+stream-dev,
- librust-log-0.4+default-dev (>= 0.4.17-~~),
+               librust-handlebars-3+default-dev,
- librust-nix-0.26+default-dev (>= 0.26.1-~~),
+               librust-hex-0.4+default-dev (>= 0.4.3-~~),
- librust-nom-7+default-dev,
+               librust-hex-0.4+serde-dev (>= 0.4.3-~~),
- librust-num-traits-0.2+default-dev,
+               librust-http-0.2+default-dev,
- librust-once-cell-1+default-dev (>= 1.3.1-~~),
+               librust-hyper-0.14+default-dev,
- librust-openssl-0.10+default-dev (>= 0.10.40-~~),
+               librust-hyper-0.14+full-dev,
- librust-pam-0.7+default-dev,
+               librust-lazy-static-1+default-dev (>= 1.4-~~),
- librust-pam-sys-0.5+default-dev,
+               librust-libc-0.2+default-dev,
- librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~),
+               librust-log-0.4+default-dev (>= 0.4.17-~~),
- librust-percent-encoding-2+default-dev (>= 2.1-~~),
+               librust-nix-0.26+default-dev (>= 0.26.1-~~),
- librust-pin-project-lite-0.2+default-dev,
+               librust-nom-7+default-dev,
- librust-proxmox-acme-rs-0.4+default-dev,
+               librust-num-traits-0.2+default-dev,
- librust-proxmox-apt-0.9+default-dev,
+               librust-once-cell-1+default-dev (>= 1.3.1-~~),
- librust-proxmox-async-0.4+default-dev,
+               librust-openssl-0.10+default-dev (>= 0.10.40-~~),
- librust-proxmox-auth-api-0.1+api-dev,
+               librust-pam-0.7+default-dev,
- librust-proxmox-auth-api-0.1+api-types-dev,
+               librust-pam-sys-0.5+default-dev,
- librust-proxmox-auth-api-0.1+default-dev,
+               librust-pathpatterns-0.1+default-dev (>= 0.1.2-~~),
- librust-proxmox-auth-api-0.1+pam-authenticator-dev,
+               librust-percent-encoding-2+default-dev (>= 2.1-~~),
- librust-proxmox-borrow-1+default-dev,
+               librust-pin-project-lite-0.2+default-dev,
- librust-proxmox-compression-0.1+default-dev (>= 0.1.1-~~),
+               librust-proxmox-acme-rs-0.4+default-dev,
- librust-proxmox-fuse-0.1+default-dev (>= 0.1.3-~~),
+               librust-proxmox-apt-0.9+default-dev,
- librust-proxmox-http-0.8+client-dev,
+               librust-proxmox-async-0.4+default-dev,
- librust-proxmox-http-0.8+client-trait-dev,
+               librust-proxmox-auth-api-0.1+api-dev,
- librust-proxmox-http-0.8+default-dev,
+               librust-proxmox-auth-api-0.1+api-types-dev,
- librust-proxmox-http-0.8+http-helpers-dev,
+               librust-proxmox-auth-api-0.1+default-dev,
- librust-proxmox-http-0.8+proxmox-async-dev,
+               librust-proxmox-auth-api-0.1+pam-authenticator-dev,
- librust-proxmox-http-0.8+rate-limited-stream-dev,
+               librust-proxmox-borrow-1+default-dev,
- librust-proxmox-http-0.8+rate-limiter-dev,
+               librust-proxmox-compression-0.1+default-dev (>= 0.1.1-~~),
- librust-proxmox-http-0.8+websocket-dev,
+               librust-proxmox-fuse-0.1+default-dev (>= 0.1.3-~~),
- librust-proxmox-io-1+default-dev (>= 1.0.1-~~),
+               librust-proxmox-http-0.8+client-dev,
- librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~),
+               librust-proxmox-http-0.8+client-trait-dev,
- librust-proxmox-lang-1+default-dev (>= 1.1-~~),
+               librust-proxmox-http-0.8+default-dev,
- librust-proxmox-ldap-0.1+default-dev,
+               librust-proxmox-http-0.8+http-helpers-dev,
- librust-proxmox-metrics-0.2+default-dev,
+               librust-proxmox-http-0.8+proxmox-async-dev,
- librust-proxmox-openid-0.9+default-dev (>= 0.9.9-~~),
+               librust-proxmox-http-0.8+rate-limited-stream-dev,
- librust-proxmox-rest-server-0.3+default-dev,
+               librust-proxmox-http-0.8+rate-limiter-dev,
- librust-proxmox-rest-server-0.3+rate-limited-stream-dev,
+               librust-proxmox-http-0.8+websocket-dev,
- librust-proxmox-rest-server-0.3+templates-dev,
+               librust-proxmox-io-1+default-dev (>= 1.0.1-~~),
- librust-proxmox-router-1+cli-dev (>= 1.3.1-~~),
+               librust-proxmox-io-1+tokio-dev (>= 1.0.1-~~),
- librust-proxmox-router-1+default-dev (>= 1.3.1-~~),
+               librust-proxmox-lang-1+default-dev (>= 1.1-~~),
- librust-proxmox-router-1+server-dev (>= 1.3.1-~~),
+               librust-proxmox-ldap-0.1+default-dev,
- librust-proxmox-schema-1+api-macro-dev (>= 1.3.6-~~),
+               librust-proxmox-metrics-0.2+default-dev,
- librust-proxmox-schema-1+default-dev (>= 1.3.6-~~),
+               librust-proxmox-openid-0.9+default-dev (>= 0.9.9-~~),
- librust-proxmox-section-config-1+default-dev,
+               librust-proxmox-rest-server-0.3+default-dev,
- librust-proxmox-serde-0.1+default-dev (>= 0.1.1-~~),
+               librust-proxmox-rest-server-0.3+rate-limited-stream-dev,
- librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~),
+               librust-proxmox-rest-server-0.3+templates-dev,
- librust-proxmox-shared-memory-0.2+default-dev (>= 0.2.3-~~),
+               librust-proxmox-router-1+cli-dev (>= 1.3.1-~~),
- librust-proxmox-sortable-macro-0.1+default-dev (>= 0.1.2-~~),
+               librust-proxmox-router-1+default-dev (>= 1.3.1-~~),
- librust-proxmox-subscription-0.3+api-types-dev,
+               librust-proxmox-router-1+server-dev (>= 1.3.1-~~),
- librust-proxmox-subscription-0.3+default-dev,
+               librust-proxmox-schema-1+api-macro-dev (>= 1.3.6-~~),
- librust-proxmox-sys-0.4+acl-dev (>= 0.4.2-~~),
+               librust-proxmox-schema-1+default-dev (>= 1.3.6-~~),
- librust-proxmox-sys-0.4+crypt-dev (>= 0.4.2-~~),
+               librust-proxmox-section-config-1+default-dev,
- librust-proxmox-sys-0.4+default-dev (>= 0.4.2-~~),
+               librust-proxmox-serde-0.1+default-dev (>= 0.1.1-~~),
- librust-proxmox-sys-0.4+logrotate-dev (>= 0.4.2-~~),
+               librust-proxmox-serde-0.1+serde-json-dev (>= 0.1.1-~~),
- librust-proxmox-sys-0.4+timer-dev (>= 0.4.2-~~),
+               librust-proxmox-shared-memory-0.2+default-dev (>= 0.2.3-~~),
- librust-proxmox-tfa-4+api-dev,
+               librust-proxmox-sortable-macro-0.1+default-dev (>= 0.1.2-~~),
- librust-proxmox-tfa-4+api-types-dev,
+               librust-proxmox-subscription-0.3+api-types-dev,
- librust-proxmox-tfa-4+default-dev,
+               librust-proxmox-subscription-0.3+default-dev,
- librust-proxmox-time-1+default-dev (>= 1.1.2-~~),
+               librust-proxmox-sys-0.4+acl-dev (>= 0.4.2-~~),
- librust-proxmox-uuid-1+default-dev,
+               librust-proxmox-sys-0.4+crypt-dev (>= 0.4.2-~~),
- librust-proxmox-uuid-1+serde-dev,
+               librust-proxmox-sys-0.4+default-dev (>= 0.4.2-~~),
- librust-pxar-0.10+default-dev (>= 0.10.2-~~),
+               librust-proxmox-sys-0.4+logrotate-dev (>= 0.4.2-~~),
- librust-regex-1+default-dev (>= 1.5.5-~~),
+               librust-proxmox-sys-0.4+timer-dev (>= 0.4.2-~~),
- librust-rustyline-9+default-dev,
+               librust-proxmox-tfa-4+api-dev,
- librust-serde-1+default-dev,
+               librust-proxmox-tfa-4+api-types-dev,
- librust-serde-1+derive-dev,
+               librust-proxmox-tfa-4+default-dev,
- librust-serde-cbor-0.11+default-dev (>= 0.11.1-~~),
+               librust-proxmox-time-1+default-dev (>= 1.1.2-~~),
- librust-serde-json-1+default-dev,
+               librust-proxmox-uuid-1+default-dev,
- librust-serde-plain-1+default-dev,
+               librust-proxmox-uuid-1+serde-dev,
- librust-siphasher-0.3+default-dev,
+               librust-pxar-0.10+default-dev (>= 0.10.2-~~),
- librust-syslog-6+default-dev,
+               librust-regex-1+default-dev (>= 1.5.5-~~),
- librust-tar-0.4+default-dev,
+               librust-rustyline-9+default-dev,
- librust-termcolor-1+default-dev (>= 1.1.2-~~),
+               librust-serde-1+default-dev,
- librust-thiserror-1+default-dev,
+               librust-serde-1+derive-dev,
- librust-tokio-1+default-dev (>= 1.6-~~),
+               librust-serde-cbor-0.11+default-dev (>= 0.11.1-~~),
- librust-tokio-1+fs-dev (>= 1.6-~~),
+               librust-serde-json-1+default-dev,
- librust-tokio-1+io-std-dev (>= 1.6-~~),
+               librust-serde-plain-1+default-dev,
- librust-tokio-1+io-util-dev (>= 1.6-~~),
+               librust-siphasher-0.3+default-dev,
- librust-tokio-1+macros-dev (>= 1.6-~~),
+               librust-syslog-6+default-dev,
- librust-tokio-1+net-dev (>= 1.6-~~),
+               librust-tar-0.4+default-dev,
- librust-tokio-1+parking-lot-dev (>= 1.6-~~),
+               librust-termcolor-1+default-dev (>= 1.1.2-~~),
- librust-tokio-1+process-dev (>= 1.6-~~),
+               librust-thiserror-1+default-dev,
- librust-tokio-1+rt-dev (>= 1.6-~~),
+               librust-tokio-1+default-dev (>= 1.6-~~),
- librust-tokio-1+rt-multi-thread-dev (>= 1.6-~~),
+               librust-tokio-1+fs-dev (>= 1.6-~~),
- librust-tokio-1+signal-dev (>= 1.6-~~),
+               librust-tokio-1+io-std-dev (>= 1.6-~~),
- librust-tokio-1+sync-dev (>= 1.6-~~),
+               librust-tokio-1+io-util-dev (>= 1.6-~~),
- librust-tokio-1+time-dev (>= 1.6-~~),
+               librust-tokio-1+macros-dev (>= 1.6-~~),
- librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~),
+               librust-tokio-1+net-dev (>= 1.6-~~),
- librust-tokio-stream-0.1+default-dev,
+               librust-tokio-1+parking-lot-dev (>= 1.6-~~),
- librust-tokio-util-0.7+codec-dev,
+               librust-tokio-1+process-dev (>= 1.6-~~),
- librust-tokio-util-0.7+default-dev,
+               librust-tokio-1+rt-dev (>= 1.6-~~),
- librust-tokio-util-0.7+io-dev,
+               librust-tokio-1+rt-multi-thread-dev (>= 1.6-~~),
- librust-tower-service-0.3+default-dev,
+               librust-tokio-1+signal-dev (>= 1.6-~~),
- librust-udev-0.4+default-dev,
+               librust-tokio-1+sync-dev (>= 1.6-~~),
- librust-url-2+default-dev (>= 2.1-~~),
+               librust-tokio-1+time-dev (>= 1.6-~~),
- librust-walkdir-2+default-dev,
+               librust-tokio-openssl-0.6+default-dev (>= 0.6.1-~~),
- librust-xdg-2+default-dev (>= 2.2-~~),
+               librust-tokio-stream-0.1+default-dev,
- librust-zstd-0.12+bindgen-dev,
+               librust-tokio-util-0.7+codec-dev,
- librust-zstd-0.12+default-dev,
+               librust-tokio-util-0.7+default-dev,
- libacl1-dev,
+               librust-tokio-util-0.7+io-dev,
- libfuse3-dev,
+               librust-tower-service-0.3+default-dev,
- libsystemd-dev (>= 246-~~),
+               librust-udev-0.4+default-dev,
- uuid-dev,
+               librust-url-2+default-dev (>= 2.1-~~),
- libsgutils2-dev,
+               librust-walkdir-2+default-dev,
- bash-completion,
+               librust-xdg-2+default-dev (>= 2.2-~~),
- debhelper (>= 12~),
+               librust-zstd-0.12+bindgen-dev,
- fonts-dejavu-core <!nodoc>,
+               librust-zstd-0.12+default-dev,
- fonts-lato <!nodoc>,
+               libsgutils2-dev,
- fonts-open-sans <!nodoc>,
+               libstd-rust-dev,
- graphviz <!nodoc>,
+               libsystemd-dev (>= 246-~~),
- jq,
+               patchelf,
- latexmk <!nodoc>,
+               proxmox-widget-toolkit-dev <!nodoc>,
- patchelf,
+               pve-eslint (>= 7.18.0~),
- proxmox-widget-toolkit-dev <!nodoc>,
+               python3-docutils,
- pve-eslint (>= 7.18.0~),
+               python3-pygments,
- python3-docutils,
+               python3-sphinx <!nodoc>,
- python3-pygments,
+               rsync,
- python3-sphinx <!nodoc>,
+               rustc:native,
- rsync,
+               texlive-fonts-extra <!nodoc>,
- texlive-fonts-extra <!nodoc>,
+               texlive-fonts-recommended <!nodoc>,
- texlive-fonts-recommended <!nodoc>,
+               texlive-xetex <!nodoc>,
- texlive-xetex <!nodoc>,
+               uuid-dev,
- xindy <!nodoc>
+               xindy <!nodoc>,
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Standards-Version: 4.5.1
 Vcs-Git: git://git.proxmox.com/git/proxmox-backup.git
@@ -180,19 +180,17 @@ Depends: fonts-font-awesome,
          smartmontools,
          ${misc:Depends},
          ${shlibs:Depends},
-Recommends: zfsutils-linux,
+Recommends: ifupdown2,
-            ifupdown2,
-            proxmox-offline-mirror-helper,
             proxmox-mail-forward,
+            proxmox-offline-mirror-helper,
+            zfsutils-linux,
 Description: Proxmox Backup Server daemon with tools and GUI
  This package contains the Proxmox Backup Server daemons and related
  tools. This includes a web-based graphical user interface.
 
 Package: proxmox-backup-client
 Architecture: any
-Depends: qrencode,
+Depends: qrencode, ${misc:Depends}, ${shlibs:Depends},
-         ${misc:Depends},
-         ${shlibs:Depends},
 Description: Proxmox Backup Client tools
  This package contains the Proxmox Backup client, which provides a
  simple command line tool to create and restore backups.
@@ -200,21 +198,16 @@ Description: Proxmox Backup Client tools
 Package: proxmox-backup-docs
 Build-Profiles: <!nodoc>
 Section: doc
-Depends: fonts-font-awesome,
+Depends: fonts-font-awesome, libjs-extjs, libjs-mathjax, ${misc:Depends},
-         libjs-extjs,
-         libjs-mathjax,
-         ${misc:Depends},
 Architecture: all
 Description: Proxmox Backup Documentation
  This package contains the Proxmox Backup Documentation files.
 
 Package: proxmox-backup-file-restore
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
-         ${shlibs:Depends},
+Recommends: proxmox-backup-restore-image, pve-qemu-kvm (>= 5.0.0-9),
-Recommends: pve-qemu-kvm (>= 5.0.0-9),
+Breaks: proxmox-backup-restore-image (<< 0.3.1),
-            proxmox-backup-restore-image,
-Breaks: proxmox-backup-restore-image (<< 0.3.1)
 Description: Proxmox Backup single file restore tools for pxar and block device backups
  This package contains the Proxmox Backup single file restore client for
  restoring individual files and folders from both host/container and VM/block

debian/proxmox-backup-docs.links

@@ -1,6 +1,6 @@
 /usr/share/doc/proxmox-backup/proxmox-backup.pdf /usr/share/doc/proxmox-backup/html/proxmox-backup.pdf
-/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/prune-simulator/extjs
-/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/lto-barcode/extjs
 /usr/share/fonts-font-awesome/ /usr/share/doc/proxmox-backup/html/lto-barcode/font-awesome
 /usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/api-viewer/extjs
+/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/lto-barcode/extjs
+/usr/share/javascript/extjs /usr/share/doc/proxmox-backup/html/prune-simulator/extjs
 /usr/share/javascript/mathjax /usr/share/doc/proxmox-backup/html/_static/mathjax

debian/proxmox-backup-file-restore.install

@@ -1,4 +1,4 @@
 usr/bin/proxmox-file-restore
+usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon
 usr/share/man/man1/proxmox-file-restore.1
 usr/share/zsh/vendor-completions/_proxmox-file-restore
-usr/lib/x86_64-linux-gnu/proxmox-backup/file-restore/proxmox-restore-daemon

debian/proxmox-backup-server.install

@@ -1,41 +1,41 @@
-etc/proxmox-backup-proxy.service /lib/systemd/system/
+etc/pbs-enterprise.list /etc/apt/sources.list.d/
-etc/proxmox-backup.service /lib/systemd/system/
 etc/proxmox-backup-banner.service /lib/systemd/system/
 etc/proxmox-backup-daily-update.service /lib/systemd/system/
 etc/proxmox-backup-daily-update.timer /lib/systemd/system/
-etc/pbs-enterprise.list /etc/apt/sources.list.d/
+etc/proxmox-backup-proxy.service /lib/systemd/system/
+etc/proxmox-backup.service /lib/systemd/system/
+usr/bin/pmt
+usr/bin/pmtx
+usr/bin/proxmox-tape
 usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-api
-usr/lib/x86_64-linux-gnu/proxmox-backup/proxmox-backup-proxy
 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/proxmox-backup-debug
 usr/sbin/proxmox-backup-manager
-usr/bin/pmtx
-usr/bin/pmt
-usr/bin/proxmox-tape
-usr/share/javascript/proxmox-backup/index.hbs
 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/pmt.1
+usr/share/man/man1/pmtx.1
 usr/share/man/man1/proxmox-backup-debug.1
 usr/share/man/man1/proxmox-backup-manager.1
 usr/share/man/man1/proxmox-backup-proxy.1
 usr/share/man/man1/proxmox-tape.1
-usr/share/man/man1/pmtx.1
-usr/share/man/man1/pmt.1
 usr/share/man/man5/acl.cfg.5
 usr/share/man/man5/datastore.cfg.5
 usr/share/man/man5/domains.cfg.5
-usr/share/man/man5/user.cfg.5
+usr/share/man/man5/media-pool.cfg.5
 usr/share/man/man5/remote.cfg.5
 usr/share/man/man5/sync.cfg.5
-usr/share/man/man5/verification.cfg.5
-usr/share/man/man5/media-pool.cfg.5
-usr/share/man/man5/tape.cfg.5
 usr/share/man/man5/tape-job.cfg.5
+usr/share/man/man5/tape.cfg.5
+usr/share/man/man5/user.cfg.5
+usr/share/man/man5/verification.cfg.5
+usr/share/zsh/vendor-completions/_pmt
+usr/share/zsh/vendor-completions/_pmtx
 usr/share/zsh/vendor-completions/_proxmox-backup-debug
 usr/share/zsh/vendor-completions/_proxmox-backup-manager
 usr/share/zsh/vendor-completions/_proxmox-tape
-usr/share/zsh/vendor-completions/_pmtx
-usr/share/zsh/vendor-completions/_pmt