[pve-devel] [PATCH lxc] build: use wrap-and-sort to cleanup debian/

[Fabian Grünbichler]

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---
 debian/control             | 50 ++++++++++++++++++++++++++++++++++++----------
 debian/copyright           |  1 -
 debian/lxc-pve-dev.install |  2 +-
 debian/lxc-pve.install     | 14 ++++++-------
 4 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 4323373..77a600a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,37 +2,67 @@ Source: lxc
 Section: admin
 Priority: optional
 Maintainer: Proxmox Support Team <support at proxmox.com>
-Build-Depends: debhelper (>= 9), autotools-dev, libapparmor-dev, docbook2x, libcap-dev, dh-apparmor, graphviz, libgnutls28-dev, linux-libc-dev, dh-autoreconf, libseccomp-dev, quilt, dh-systemd, doxygen, bash-completion
+Build-Depends: autotools-dev,
+               bash-completion,
+               debhelper (>= 9),
+               dh-apparmor,
+               dh-autoreconf,
+               dh-systemd,
+               docbook2x,
+               doxygen,
+               graphviz,
+               libapparmor-dev,
+               libcap-dev,
+               libgnutls28-dev,
+               libseccomp-dev,
+               linux-libc-dev,
+               quilt,
 Standards-Version: 3.9.5
 Homepage: https://linuxcontainers.org
 
 Package: lxc-pve
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libcap2, apparmor, python3, bridge-utils, uidmap, libgnutlsxx28, criu (>= 1.5.2-1), lxcfs, libseccomp2
-Conflicts: lxc, liblxc1
-Replaces: lxc, liblxc1
-Provides: lxc, liblxc1
+Depends: apparmor,
+         bridge-utils,
+         criu (>= 1.5.2-1),
+         libcap2,
+         libgnutlsxx28,
+         libseccomp2,
+         lxcfs,
+         python3,
+         uidmap,
+         ${misc:Depends},
+         ${shlibs:Depends},
+Conflicts: liblxc1,
+           lxc,
+Replaces: liblxc1,
+          lxc,
+Provides: liblxc1,
+          lxc,
 Description: Linux containers usersapce tools
  Containers provides resource management through control groups and
  resource isolation through namespaces. The linux containers, lxc, aims
  to use these new functionalities to provide an userspace container
  object which provides full resource isolation and resource control for
- an applications or a system. 
+ an applications or a system.
 
 Package: lxc-pve-dbg
 Section: debug
 Architecture: any
-Depends: lxc-pve (= ${binary:Version}), lxc-pve-dev (= ${binary:Version}), ${misc:Depends}
+Depends: lxc-pve (= ${binary:Version}),
+         lxc-pve-dev (= ${binary:Version}),
+         ${misc:Depends},
 Description: Debug symbols for LXC
- This package contains the debug symbols for LXC. 
+ This package contains the debug symbols for LXC.
 
 Package: lxc-pve-dev
 Section: libdevel
 Architecture: any
-Depends: lxc-pve (= ${binary:Version}), ${misc:Depends}
+Depends: lxc-pve (= ${binary:Version}),
+         ${misc:Depends},
 Description: Linux Containers userspace tools (development)
  Containers provides resource management through control groups and
  resource isolation through namespaces. The linux containers, lxc, aims
  to use these new functionalities to provide an userspace container
  object which provides full resource isolation and resource control for
- an applications or a system. 
+ an applications or a system.
diff --git a/debian/copyright b/debian/copyright
index d0f1874..a9d776e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -39,4 +39,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
diff --git a/debian/lxc-pve-dev.install b/debian/lxc-pve-dev.install
index f435b2e..90d8c98 100644
--- a/debian/lxc-pve-dev.install
+++ b/debian/lxc-pve-dev.install
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/*/pkgconfig
 usr/lib/*/*.so
+usr/lib/*/pkgconfig
diff --git a/debian/lxc-pve.install b/debian/lxc-pve.install
index 8ceffad..618fea3 100644
--- a/debian/lxc-pve.install
+++ b/debian/lxc-pve.install
@@ -1,11 +1,11 @@
+etc
+lib/systemd
 usr/bin
-usr/sbin
-usr/share/man
-usr/share/lxc
-usr/share/bash-completion/completions/lxc
 usr/lib/*/*.so.*
-usr/lib/*/lxc/lxc-*
 usr/lib/*/lxc/hooks/*
+usr/lib/*/lxc/lxc-*
 usr/lib/*/lxc/rootfs/README
-lib/systemd
-etc
+usr/sbin
+usr/share/bash-completion/completions/lxc
+usr/share/lxc
+usr/share/man
-- 
2.14.1