From b8af8dd4fa98d79132e4fee50876e113bdbe8671 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Sun, 21 May 2023 15:47:38 +0200 Subject: [PATCH] debian: normalize packaging files with wrap-and-sort -tkn Signed-off-by: Thomas Lamprecht --- debian/control | 10 +++++----- debian/pve-qemu-kvm.install | 7 +++---- debian/pve-qemu-kvm.links | 13 +++++-------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/debian/control b/debian/control index 37ae4ee..27806cc 100644 --- a/debian/control +++ b/debian/control @@ -64,8 +64,8 @@ Depends: ceph-common (>= 0.48), libuuid1, ${misc:Depends}, ${shlibs:Depends}, -Recommends: numactl -Suggests: libgl1 +Recommends: numactl, +Suggests: libgl1, Conflicts: kvm, pve-kvm, pve-qemu-kvm-2.6.18, @@ -73,10 +73,10 @@ Conflicts: kvm, qemu-kvm, qemu-system-arm, qemu-system-common, - qemu-system-x86, qemu-system-data, + qemu-system-x86, qemu-utils, -Provides: qemu-system-arm, qemu-system-x86, qemu-utils +Provides: qemu-system-arm, qemu-system-x86, qemu-utils, Replaces: pve-kvm, pve-qemu-kvm-2.6.18, qemu-system-arm, @@ -90,6 +90,6 @@ Description: Full virtualization on x86 hardware Package: pve-qemu-kvm-dbg Architecture: any Section: debug -Depends: pve-qemu-kvm (= ${binary:Version}) +Depends: pve-qemu-kvm (= ${binary:Version}), Description: pve qemu debugging symbols This package contains the debugging symbols for pve-qemu-kvm. diff --git a/debian/pve-qemu-kvm.install b/debian/pve-qemu-kvm.install index 723d548..64da1c9 100644 --- a/debian/pve-qemu-kvm.install +++ b/debian/pve-qemu-kvm.install @@ -1,7 +1,6 @@ -# install the userspace utilities -debian/kvm-ifup etc/kvm/ -debian/kvm-ifdown etc/kvm/ - #install ovmf uefi rom debian/OVMF_CODE-pure-efi.fd usr/share/kvm/ debian/OVMF_VARS-pure-efi.fd usr/share/kvm/ +debian/kvm-ifdown etc/kvm/ +# install the userspace utilities +debian/kvm-ifup etc/kvm/ diff --git a/debian/pve-qemu-kvm.links b/debian/pve-qemu-kvm.links index 7d9c8b1..7314aa4 100644 --- a/debian/pve-qemu-kvm.links +++ b/debian/pve-qemu-kvm.links @@ -1,16 +1,13 @@ -usr/bin/qemu-system-x86_64 usr/bin/kvm - -# qemu-system-i386 and qemu-system-x86_64 provides the same hardware emulation -usr/bin/qemu-system-x86_64 usr/bin/qemu-system-i386 - # also use aarch64 for 32 bit arm usr/bin/qemu-system-aarch64 usr/bin/qemu-system-arm - +usr/bin/qemu-system-x86_64 usr/bin/kvm +# qemu-system-i386 and qemu-system-x86_64 provides the same hardware emulation +usr/bin/qemu-system-x86_64 usr/bin/qemu-system-i386 # upstream provides a qemu man page, # we symlink to kvm for backward compatibility # and to qemu-system-{i386,x86_64} to fullfill our 'Provides: qemu-system-x86' usr/share/man/man1/qemu.1 usr/share/man/man1/kvm.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-aarch64.1 +usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-arm.1 usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-i386.1 usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-x86_64.1 -usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-arm.1 -usr/share/man/man1/qemu.1 usr/share/man/man1/qemu-system-aarch64.1