Wrap and sorting debian packaging files.

Signed-off-by: Daniel Baumann <daniel@debian.org>

4 files changed, 100 insertions, 83 deletions

diff --git a/debian/control b/debian/control
index 0ac16772..97c38902 100644
--- a/debian/control
+++ b/debian/control
@@ -2,38 +2,40 @@ Source: frr
 Section: net
 Priority: optional
 Maintainer: David Lamparter <equinox-debian@diac24.net>
-Uploaders: FRRouting-dev <dev@lists.frrouting.org>,
-           Ondřej Surý <ondrej@debian.org>,
-           Daniel Baumann <daniel@debian.org>,
-Build-Depends: bison,
-               chrpath,
-               debhelper-compat (= 13),
-               flex,
-               gawk,
-               install-info,
-               libc-ares-dev,
-               libcap-dev,
-               libelf-dev:native,
-               libjson-c-dev,
-               libpam0g-dev,
-               libpcre2-dev,
-               libprotobuf-c-dev,
-               libpython3-dev:native,
-               libreadline-dev,
-               librtr-dev <!pkg.frr.nortrlib>,
-               libsnmp-dev,
-               libssh-dev <!pkg.frr.nortrlib>,
-               libunwind-dev [!alpha !m68k !sparc64 !x32],
-               libyang2-dev (>= 2.1.128),
-               pkgconf,
-               protobuf-c-compiler,
-               python3:native,
-               python3-dev:native,
-               python3-pytest:native <!nocheck>,
-               python3-sphinx:native,
-               texinfo,
-               lua5.3 <pkg.frr.lua>,
-               liblua5.3-dev <pkg.frr.lua>
+Uploaders:
+ FRRouting-dev <dev@lists.frrouting.org>,
+ Ondřej Surý <ondrej@debian.org>,
+ Daniel Baumann <daniel@debian.org>,
+Build-Depends:
+ bison,
+ chrpath,
+ debhelper-compat (= 13),
+ flex,
+ gawk,
+ install-info,
+ libc-ares-dev,
+ libcap-dev,
+ libelf-dev:native,
+ libjson-c-dev,
+ liblua5.3-dev <pkg.frr.lua>,
+ libpam0g-dev,
+ libpcre2-dev,
+ libprotobuf-c-dev,
+ libpython3-dev:native,
+ libreadline-dev,
+ librtr-dev <!pkg.frr.nortrlib>,
+ libsnmp-dev,
+ libssh-dev <!pkg.frr.nortrlib>,
+ libunwind-dev [!alpha !m68k !sparc64 !x32],
+ libyang2-dev (>= 2.1.128),
+ lua5.3 <pkg.frr.lua>,
+ pkgconf,
+ protobuf-c-compiler,
+ python3-dev:native,
+ python3-pytest:native <!nocheck>,
+ python3-sphinx:native,
+ python3:native,
+ texinfo,
 Rules-Requires-Root: no
 Standards-Version: 4.7.0
 Homepage: https://www.frrouting.org
@@ -43,15 +45,20 @@ Vcs-Git: https://github.com/FRRouting/frr.git -b debian/master
 Package: frr
 Section: net
 Architecture: linux-any
-Depends: iproute2,
-         logrotate,
-         lsof,
-         ${misc:Depends},
-         ${shlibs:Depends}
-Pre-Depends: adduser
-Recommends: frr-pythontools
-Suggests: frr-doc
-Conflicts: pimd,
+Depends:
+ iproute2,
+ logrotate,
+ lsof,
+ ${misc:Depends},
+ ${shlibs:Depends},
+Pre-Depends:
+ adduser,
+Recommends:
+ frr-pythontools,
+Suggests:
+ frr-doc,
+Conflicts:
+ pimd,
 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.
@@ -67,40 +74,17 @@ Description: FRRouting suite of internet protocols (BGP, OSPF, IS-IS, ...)
  git lives on https://github.com/frrouting/frr.git and the project name
  is commonly abbreviated as "FRR."
 
-Package: frr-snmp
-Section: net
-Architecture: linux-any
-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
- through the AgentX protocol.  Provides read-only access to current
- routing state through standard SNMP MIBs.
-
-Package: frr-rpki-rtrlib
-Section: net
-Architecture: linux-any
-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
- used to prevent hijacking of networks on the wider internet.  It is only
- relevant to internet service providers using their own autonomous system
- number.
-Build-Profiles: <!pkg.frr.nortrlib>
-
 Package: frr-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends},
-         ${sphinxdoc:Depends}
-Built-Using: ${sphinxdoc:Built-Using}
-Suggests: frr
+Depends:
+ ${misc:Depends},
+ ${sphinxdoc:Depends},
+Built-Using:
+ ${sphinxdoc:Built-Using},
+Suggests:
+ frr,
 Description: FRRouting suite - user manual
  This provides the FRR user manual in HTML form.  This is the official
  manual maintained as part of the package and is also available online
@@ -109,10 +93,11 @@ Description: FRRouting suite - user manual
 Package: frr-pythontools
 Section: net
 Architecture: all
-Depends: frr (<< ${source:Upstream-Version}.0-~),
-         frr (>= ${source:Version}~),
-         python3:any,
-         ${misc:Depends}
+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
@@ -120,3 +105,32 @@ Description: FRRouting suite - Python tools
  .
  Without this package installed, "reload" (as a systemd or init script
  invocation) will not work for the FRR daemons.
+
+Package: frr-rpki-rtrlib
+Section: net
+Architecture: linux-any
+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
+ used to prevent hijacking of networks on the wider internet.  It is only
+ relevant to internet service providers using their own autonomous system
+ number.
+Build-Profiles: <!pkg.frr.nortrlib>
+
+Package: frr-snmp
+Section: net
+Architecture: linux-any
+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
+ through the AgentX protocol.  Provides read-only access to current
+ routing state through standard SNMP MIBs.
diff --git a/debian/frr-pythontools.install b/debian/frr-pythontools.install
index 662fbe0f..c92a982b 100644
--- a/debian/frr-pythontools.install
+++ b/debian/frr-pythontools.install
@@ -1,4 +1,4 @@
 usr/lib/frr/frr-reload.py
-usr/lib/frr/generate_support_bundle.py
 usr/lib/frr/frr_babeltrace.py
+usr/lib/frr/generate_support_bundle.py
 usr/lib/frr/ospfclient.py
diff --git a/debian/frr.install b/debian/frr.install
index 977534d1..d6bf3401 100644
--- a/debian/frr.install
+++ b/debian/frr.install
@@ -9,9 +9,9 @@ usr/lib/*/frr/libfrrospfapiclient.*
 usr/lib/*/frr/libmgmt_be_nb.so.*
 usr/lib/*/frr/modules/bgpd_bmp.so
 usr/lib/*/frr/modules/dplane_fpm_nl.so
+usr/lib/*/frr/modules/pathd_pcep.so
 usr/lib/*/frr/modules/zebra_cumulus_mlag.so
 usr/lib/*/frr/modules/zebra_fpm.so
-usr/lib/*/frr/modules/pathd_pcep.so
 usr/lib/frr/*.sh
 usr/lib/frr/*d
 usr/lib/frr/watchfrr
diff --git a/debian/tests/control b/debian/tests/control
index 6cb5b02d..5be3627f 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,14 +1,17 @@
 Tests: zebra-lo
-Depends: frr
+Depends:
+ frr,
 Restrictions: needs-root, isolation-container
 
 Tests: bgpd-snmp-rpki
-Depends: frr,
-         frr-rpki-rtrlib,
-         frr-snmp
+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