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

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

diff --git a/debian/control b/debian/control
index 37ae4ee347960585047184345ae6c288d7c56fbc..27806cc10a9081d3c0d3766d7efc0d223187997c 100644 (file)
--- 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 723d548e116a71cf3de14982adb16868bc7a0960..64da1c9941f9480dd80bf9d650d265c7aa19ba56 100644 (file)
--- 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 7d9c8b18c806b1e7fc20f942f2fd7287a39948a5..7314aa4bf005423e9c096108850619f8088d0724 100644 (file)
--- a/debian/pve-qemu-kvm.links
+++ b/debian/pve-qemu-kvm.links
@@ -1,16 +1,13 @@
+# 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
-
-# also use aarch64 for 32 bit arm
-usr/bin/qemu-system-aarch64 usr/bin/qemu-system-arm
-
 # 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