debian: Use wrap-and-sort -a to unify debian/ wrapping and sorting

While it's ok to use individual wrapping/sorting in the debian/ source files,
it's often simpler to just go with the formatting supported by tools.  One such
tool is wrap-and-sort, so this commit re-wraps and re-sorts the debian/ files to
be unified and (-a) always wrapped.

Signed-off-by: Ondřej Surý <ondrej@sury.org>

diff --git a/debian/control b/debian/control
index fca69567601fe8775e89054678d7710a109ab92c..131d9fd5963ec8aa663e4142c8717639aeb5617d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,34 +3,33 @@ Section: net
 Priority: optional
 Maintainer: David Lamparter <equinox-debian@diac24.net>
 Uploaders: FRRouting-dev <dev@lists.frrouting.org>
-Build-Depends:
- autotools-dev,
- bison,
- chrpath,
- debhelper (>= 9),
- debhelper (>= 9.20160709) <!pkg.frr.nosystemd> | dh-systemd <!pkg.frr.nosystemd>,
- dh-autoreconf,
- flex,
- gawk,
- install-info,
- libc-ares-dev,
- libcap-dev,
- libjson-c-dev | libjson0-dev,
- libpam0g-dev | libpam-dev,
- libpcre3-dev,
- libpython3-dev,
- libreadline-dev,
- librtr-dev <!pkg.frr.nortrlib>,
- libsnmp-dev,
- libssh-dev <!pkg.frr.nortrlib>,
- libsystemd-dev <!pkg.frr.nosystemd>,
- libyang-dev (>= 1.0.184),
- pkg-config,
- python3,
- python3-dev,
- python3-sphinx,
- python3-pytest <!nocheck>,
- texinfo (>= 4.7)
+Build-Depends: autotools-dev,
+               bison,
+               chrpath,
+               debhelper (>= 9),
+               debhelper (>= 9.20160709) <!pkg.frr.nosystemd> | dh-systemd <!pkg.frr.nosystemd>,
+               dh-autoreconf,
+               flex,
+               gawk,
+               install-info,
+               libc-ares-dev,
+               libcap-dev,
+               libjson-c-dev | libjson0-dev,
+               libpam0g-dev | libpam-dev,
+               libpcre3-dev,
+               libpython3-dev,
+               libreadline-dev,
+               librtr-dev <!pkg.frr.nortrlib>,
+               libsnmp-dev,
+               libssh-dev <!pkg.frr.nortrlib>,
+               libsystemd-dev <!pkg.frr.nosystemd>,
+               libyang-dev (>= 1.0.184),
+               pkg-config,
+               python3,
+               python3-dev,
+               python3-pytest <!nocheck>,
+               python3-sphinx,
+               texinfo (>= 4.7)
 Standards-Version: 4.4.1
 Homepage: https://www.frrouting.org/
 Vcs-Browser: https://github.com/FRRouting/frr/tree/debian/master
@@ -38,28 +37,27 @@ Vcs-Git: https://github.com/FRRouting/frr.git -b debian/master
 
 Package: frr
 Architecture: linux-any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- iproute2 | iproute,
- logrotate (>= 3.2-11)
+Depends: iproute2 | iproute,
+         logrotate (>= 3.2-11),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Pre-Depends: adduser
 Recommends: frr-pythontools
 Suggests: frr-doc
-Conflicts:
- zebra,
- zebra-pj,
- pimd,
- quagga,
- quagga-bgpd,
- quagga-core,
- quagga-isisd,
- quagga-ospf6d,
- quagga-ospfd,
- quagga-pimd,
- quagga-ripd,
- quagga-ripngd
-Replaces: zebra, zebra-pj
+Conflicts: pimd,
+           quagga,
+           quagga-bgpd,
+           quagga-core,
+           quagga-isisd,
+           quagga-ospf6d,
+           quagga-ospfd,
+           quagga-pimd,
+           quagga-ripd,
+           quagga-ripngd,
+           zebra,
+           zebra-pj
+Replaces: zebra,
+          zebra-pj
 Description: FRRouting suite of internet protocols (BGP, OSPF, IS-IS, ...)
  FRRouting implements the routing protocols commonly used in the
  internet and private networks to exchange information between routers.
@@ -77,10 +75,9 @@ Description: FRRouting suite of internet protocols (BGP, OSPF, IS-IS, ...)
 
 Package: frr-snmp
 Architecture: linux-any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- frr (= ${binary:Version})
+Depends: frr (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Recommends: snmpd
 Description: FRRouting suite - SNMP support
  Adds SNMP support to FRR's daemons by attaching to net-snmp's snmpd
@@ -89,10 +86,9 @@ Description: FRRouting suite - SNMP support
 
 Package: frr-rpki-rtrlib
 Architecture: linux-any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
- frr (= ${binary:Version})
+Depends: frr (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: FRRouting suite - BGP RPKI support (rtrlib)
  Adds RPKI support to FRR's bgpd, allowing validation of BGP routes
  against cryptographic information stored in WHOIS databases.  This is
@@ -105,10 +101,9 @@ Package: frr-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends:
- ${misc:Depends},
- libjs-jquery,
- libjs-underscore
+Depends: libjs-jquery,
+         libjs-underscore,
+         ${misc:Depends}
 Suggests: frr
 Conflicts: quagga-doc
 Description: FRRouting suite - user manual
@@ -118,11 +113,10 @@ Description: FRRouting suite - user manual
 
 Package: frr-pythontools
 Architecture: all
-Depends:
- ${misc:Depends},
- frr (<< ${source:Upstream-Version}.0-~),
- frr (>= ${source:Version}~),
- python3:any
+Depends: frr (<< ${source:Upstream-Version}.0-~),
+         frr (>= ${source:Version}~),
+         python3:any,
+         ${misc:Depends}
 Description: FRRouting suite - Python tools
  The FRRouting suite uses a small Python tool to provide configuration
  reload functionality, particularly useful when the interactive configuration

diff --git a/debian/frr-doc.install b/debian/frr-doc.install
index c48dc5a8db68cc357554db3bbee7adfcc57adbfa..0db84886b7f2c24cdde1e2687ec71ff4a3631ea6 100644 (file)
--- a/debian/frr-doc.install
+++ b/debian/frr-doc.install
@@ -1,10 +1,8 @@
 # html docs include RST sources
-usr/share/doc/frr/html
-
 # info + images referenced by it
-usr/share/info/
-doc/user/_build/texinfo/*.png usr/share/info
-
 # other
 README.md         usr/share/doc/frr
 doc/figures/*.png usr/share/doc/frr
+doc/user/_build/texinfo/*.png usr/share/info
+usr/share/doc/frr/html
+usr/share/info/

diff --git a/debian/frr.dirs b/debian/frr.dirs
index 4b05c8c907e645e32fe76dbeeeb8adaf9ce67b00..9e592e370c67183072c3bd7a8c9922b6816d42fa 100644 (file)
--- a/debian/frr.dirs
+++ b/debian/frr.dirs
@@ -1,6 +1,6 @@
-etc/logrotate.d/
 etc/frr/
 etc/iproute2/rt_protos.d/
+etc/logrotate.d/
 usr/share/doc/frr/
 usr/share/doc/frr/examples/
 usr/share/lintian/overrides/

diff --git a/debian/frr.docs b/debian/frr.docs
index 34dbbd7bc75beea3b133b999230d613b5154243c..220127caa1f423ab5bd4f1510b006e6139ad6aa6 100644 (file)
--- a/debian/frr.docs
+++ b/debian/frr.docs
@@ -1,2 +1,2 @@
-tools/zebra.el
 debian/README.Debian
+tools/zebra.el

diff --git a/debian/frr.install b/debian/frr.install
index e2485fe8b8ca4775f77c84cdad49610f59a0611c..cefc3135b2e5d1f82c30a381b90f24f59fc3c779 100644 (file)
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -1,20 +1,20 @@
+debian/frr.conf usr/lib/tmpfiles.d
 etc/
-usr/bin/vtysh
+tools/frr-reload usr/lib/frr/
 usr/bin/mtracebis
+usr/bin/vtysh
 usr/lib/*/frr/libfrr.*
 usr/lib/*/frr/libfrrcares.*
 usr/lib/*/frr/libfrrospfapiclient.*
+usr/lib/*/frr/modules/bgpd_bmp.so
+usr/lib/*/frr/modules/dplane_fpm_nl.so
+usr/lib/*/frr/modules/zebra_cumulus_mlag.so
+usr/lib/*/frr/modules/zebra_fpm.so
+usr/lib/*/frr/modules/zebra_irdp.so
 usr/lib/frr/*.sh
 usr/lib/frr/*d
 usr/lib/frr/watchfrr
 usr/lib/frr/zebra
-usr/lib/*/frr/modules/zebra_cumulus_mlag.so
-usr/lib/*/frr/modules/dplane_fpm_nl.so
-usr/lib/*/frr/modules/zebra_irdp.so
-usr/lib/*/frr/modules/zebra_fpm.so
-usr/lib/*/frr/modules/bgpd_bmp.so
 usr/share/doc/frr/examples
 usr/share/man/
 usr/share/yang/
-tools/frr-reload usr/lib/frr/
-debian/frr.conf usr/lib/tmpfiles.d

diff --git a/debian/tests/control b/debian/tests/control
index 5990a693707e939b4fe9b027d8825bc5fa1e82aa..6cb5b02dc1ebaad0c5f1ace016e763c25e3cb03d 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -3,9 +3,12 @@ Depends: frr
 Restrictions: needs-root, isolation-container
 
 Tests: bgpd-snmp-rpki
-Depends: frr, frr-snmp, frr-rpki-rtrlib
+Depends: frr,
+         frr-rpki-rtrlib,
+         frr-snmp
 Restrictions: needs-root, isolation-container
 
 Tests: py-frr-reload
-Depends: frr, frr-pythontools
+Depends: frr,
+         frr-pythontools
 Restrictions: needs-root, isolation-container