Merge remote-tracking branch 'upstream/current' into current

* upstream/current:
  Do not try to decode data read from /sys files in the show version script, it's already an str.
  Dependencies on file and pystache, for install and show version scripts..
  Add dependency on hvinfo, too.
  T637, T638: add dependencies on tcpdump and bmon.
  T638: new op mode CLI for the bandwidth monitor commands.
  T637: new op mode for traffic dumps based on tcpdump.
  Correct the logic of generating tag nodes for op mode.
  Add missing vyos.base module
  Fix cron interval regex to allow single digit values.
  Fix misplaces ConfigError exception.
  Some more valueless fixes.
  Mark nodes in SSH and NTP valueless (related to T602).

1 files changed, 18 insertions, 5 deletions

diff --git a/debian/control b/debian/control
index 351715c07..c31c470e9 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,27 @@ Source: vyos-1x
 Section: contrib/net
 Priority: extra
 Maintainer: VyOS Package Maintainers <maintainers@vyos.net>
-Build-Depends: debhelper (>= 9), python3, python3-setuptools, quilt,
- python3-lxml
+Build-Depends: debhelper (>= 9),
+  quilt,
+  python3,
+  python3-setuptools,
+  quilt,
+  python3-lxml
 Standards-Version: 3.9.6
 
 Package: vyos-1x
 Architecture: all
-Depends: python3, ${python3:Depends}, python3-netifaces,
- python3-jinja2, ipaddrcheck
- ${shlibs:Depends}, ${misc:Depends}
+Depends: python3,
+  ${python3:Depends},
+  python3-netifaces,
+  python3-jinja2,
+  python3-pystache,
+  ipaddrcheck,
+  tcpdump,
+  bmon,
+  hvinfo,
+  file,
+  ${shlibs:Depends},
+  ${misc:Depends}
 Description: VyOS configuration scripts and data
  VyOS configuration scripts, interface definitions, and everything