From a2c704faeae080a94c7738e8e59abac5b4954961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Delafond?= <sdelafond@gmail.com>
Date: Wed, 1 Aug 2018 16:38:07 +0200
Subject: [PATCH] [lintian] Always depend on ${misc:Depends}

NGFW-11585 @exclude
---
 untangle-apache2-config/debian/control               | 2 +-
 untangle-archive-keyring/debian/control              | 2 +-
 untangle-bootsplash/debian/control                   | 2 +-
 untangle-clamav-config/debian/control                | 2 +-
 untangle-client-local/debian/control                 | 2 +-
 untangle-database-config/debian/control              | 2 +-
 untangle-ddclient-config/debian/control              | 2 +-
 untangle-development-build/debian/control            | 2 +-
 untangle-development-kernel/debian/control           | 2 +-
 untangle-development-runtime/debian/control          | 2 +-
 untangle-exim4-config/debian/control                 | 2 +-
 untangle-extra-utils/debian/control                  | 2 +-
 untangle-firmware-common/debian/control              | 2 +-
 untangle-gateway/debian/control                      | 2 +-
 untangle-geoip-database/debian/control               | 2 +-
 untangle-hardware-amazon-ec2/debian/control          | 2 +-
 untangle-hardware-asus-ac88u/debian/control          | 2 +-
 untangle-hardware-config/debian/control              | 2 +-
 untangle-hardware-jetway-u50w/debian/control         | 2 +-
 untangle-hardware-lanner-m1500/debian/control        | 2 +-
 untangle-hardware-lanner-m3000/debian/control        | 2 +-
 untangle-hardware-lanner-u150/debian/control         | 2 +-
 untangle-hardware-lanner-u25/debian/control          | 2 +-
 untangle-hardware-lanner-u25w/debian/control         | 2 +-
 untangle-hardware-lanner-u50/debian/control          | 2 +-
 untangle-hardware-lanner-u500/debian/control         | 2 +-
 untangle-hardware-linksys-wrt1900acs/debian/control  | 2 +-
 untangle-hardware-linksys-wrt3200acm/debian/control  | 2 +-
 untangle-hardware-portwell-m1500/debian/control      | 2 +-
 untangle-hardware-portwell-m3000/debian/control      | 2 +-
 untangle-hardware-portwell-u10/debian/control        | 2 +-
 untangle-hardware-portwell-u150/debian/control       | 2 +-
 untangle-hardware-portwell-u50/debian/control        | 2 +-
 untangle-hardware-portwell-u500/debian/control       | 2 +-
 untangle-hardware-qotom-u25x/debian/control          | 2 +-
 untangle-hardware-qotom-u25xw/debian/control         | 2 +-
 untangle-hardware-qotom-u50x/debian/control          | 2 +-
 untangle-hardware-qotom-u50xw/debian/control         | 2 +-
 untangle-hardware-turris-omnia/debian/control        | 2 +-
 untangle-kernel-modules-stretch-amd64/debian/control | 2 +-
 untangle-kernel-modules-stretch-i386/debian/control  | 2 +-
 untangle-kiosk/debian/control                        | 2 +-
 untangle-linux-config/debian/control                 | 2 +-
 untangle-lxc-client/debian/control                   | 2 +-
 untangle-nflogd/debian/control                       | 2 +-
 untangle-nsis-addons/debian/control                  | 2 +-
 untangle-postgresql-config/debian/control            | 2 +-
 untangle-pyconnector/debian/control                  | 2 +-
 untangle-python-sync-settings/debian/control         | 2 +-
 untangle-root/debian/control                         | 2 +-
 untangle-snmpd-config/debian/control                 | 2 +-
 untangle-snort-config/debian/control                 | 2 +-
 untangle-softflowd-config/debian/control             | 2 +-
 untangle-spamassassin-update/debian/control          | 2 +-
 untangle-squid-config/debian/control                 | 2 +-
 untangle-stunnel-config/debian/control               | 2 +-
 untangle-sync-settings/debian/control                | 2 +-
 untangle-system-config/debian/control                | 2 +-
 58 files changed, 58 insertions(+), 58 deletions(-)

diff --git a/untangle-apache2-config/debian/control b/untangle-apache2-config/debian/control
index 9b9a45aff5..b52121772f 100644
--- a/untangle-apache2-config/debian/control
+++ b/untangle-apache2-config/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-apache2-config
 Architecture: all
-Depends: systemd, apache2, libapache2-mod-jk, libapache2-mod-python, python-psycopg2, bsdmainutils, fonts-font-awesome, untangle-extjs
+Depends: ${misc:Depends}, systemd, apache2, libapache2-mod-jk, libapache2-mod-python, python-psycopg2, bsdmainutils, fonts-font-awesome, untangle-extjs
 Pre-Depends: systemd, untangle-debconf-manager
 Description: The Untangle Apache2 config
  The Untangle Apache2 config.
diff --git a/untangle-archive-keyring/debian/control b/untangle-archive-keyring/debian/control
index d829f1ab94..e588f15d5e 100644
--- a/untangle-archive-keyring/debian/control
+++ b/untangle-archive-keyring/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-archive-keyring
 Architecture: all
-Depends: gnupg (>= 1.0.6-4)
+Depends: ${misc:Depends}, gnupg (>= 1.0.6-4)
 Provides: untangle-keyring
 Replaces: untangle-keyring
 Conflicts: untangle-keyring
diff --git a/untangle-bootsplash/debian/control b/untangle-bootsplash/debian/control
index e8a91cd95c..dc671414fa 100644
--- a/untangle-bootsplash/debian/control
+++ b/untangle-bootsplash/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-bootsplash
 Architecture: all
-Depends: plymouth-themes, plymouth, v86d, untangle-hardware-config
+Depends: ${misc:Depends}, plymouth-themes, plymouth, v86d, untangle-hardware-config
 Description: The Untangle bootsplash utilities
  The Untangle bootsplash utilities using at boot time.
 
diff --git a/untangle-clamav-config/debian/control b/untangle-clamav-config/debian/control
index 94e660be75..f254cd211f 100644
--- a/untangle-clamav-config/debian/control
+++ b/untangle-clamav-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-clamav-config
 Architecture: all
-Depends: systemd, clamav (>= 0.93~dfsg), clamav-daemon (>= 0.93~dfsg), clamav-freshclam (>= 0.93~dfsg), unrar, lhasa, arj, zoo
+Depends: ${misc:Depends}, systemd, clamav (>= 0.93~dfsg), clamav-daemon (>= 0.93~dfsg), clamav-freshclam (>= 0.93~dfsg), unrar, lhasa, arj, zoo
 Description: The Untangle clamav utils
  The Untangle clamav utilities.
 
diff --git a/untangle-client-local/debian/control b/untangle-client-local/debian/control
index 042bd6f68d..9b14c92a6e 100644
--- a/untangle-client-local/debian/control
+++ b/untangle-client-local/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-client-local
 Architecture: all
-Depends: untangle-kiosk
+Depends: ${misc:Depends}, untangle-kiosk
 Description: The Untangle client, local on appliance version
  Contains dependencies needed for a basic desktop (the untangle-kiosk
  package provides the full kiosk).
diff --git a/untangle-database-config/debian/control b/untangle-database-config/debian/control
index 8eabe3687e..e78638883d 100644
--- a/untangle-database-config/debian/control
+++ b/untangle-database-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-database-config
 Architecture: any
-Depends: untangle-postgresql-config [!armel !armhf], sqlite3 [armel armhf], python-sqlite [armel armhf]
+Depends: ${misc:Depends}, untangle-postgresql-config [!armel !armhf], sqlite3 [armel armhf], python-sqlite [armel armhf]
 Description: Untangle Database config
  The Untangle database config
 
diff --git a/untangle-ddclient-config/debian/control b/untangle-ddclient-config/debian/control
index 0b66bc2104..19cc67c0db 100644
--- a/untangle-ddclient-config/debian/control
+++ b/untangle-ddclient-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-ddclient-config
 Architecture: all
-Depends: ddclient
+Depends: ${misc:Depends}, ddclient
 Description: Untangle ddclient wrapper package
  The Untangle ddclient autoconfigurator
 
diff --git a/untangle-development-build/debian/control b/untangle-development-build/debian/control
index 26779c27f2..b746fbbe58 100644
--- a/untangle-development-build/debian/control
+++ b/untangle-development-build/debian/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.8
 Package: untangle-development-build
 Architecture: all
 Pre-Depends: untangle-debconf-manager
-Depends: autoconf,
+Depends: ${misc:Depends}, autoconf,
          automake1.11,
          bzip2,
          cdbs (>= 0.4),
diff --git a/untangle-development-kernel/debian/control b/untangle-development-kernel/debian/control
index 3fc3036b01..d30d63ba92 100644
--- a/untangle-development-kernel/debian/control
+++ b/untangle-development-kernel/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-development-kernel
 Architecture: all
-Depends: qemu, qemu-kvm, vmdebootstrap, dracut, iproute2
+Depends: ${misc:Depends}, qemu, qemu-kvm, vmdebootstrap, dracut, iproute2
 Description: Untangle kernel development environment
  The Untangle kernel development environment
 
diff --git a/untangle-development-runtime/debian/control b/untangle-development-runtime/debian/control
index 9cde996b42..3de713e055 100644
--- a/untangle-development-runtime/debian/control
+++ b/untangle-development-runtime/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-development-runtime
 Architecture: all
-Depends: at,
+Depends: ${misc:Depends}, at,
          bridge-utils,
          conntrack,
          curl,
diff --git a/untangle-exim4-config/debian/control b/untangle-exim4-config/debian/control
index a57303cd58..e7acaebbeb 100644
--- a/untangle-exim4-config/debian/control
+++ b/untangle-exim4-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-exim4-config
 Architecture: all
-Depends: exim4
+Depends: ${misc:Depends}, exim4
 Description: Untangle Exim4 wrapper package
  The Untangle Exim4 config
 
diff --git a/untangle-extra-utils/debian/control b/untangle-extra-utils/debian/control
index 9be63f3863..3d3436eb37 100644
--- a/untangle-extra-utils/debian/control
+++ b/untangle-extra-utils/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-extra-utils
 Architecture: all
-Depends: apachetop,
+Depends: ${misc:Depends}, apachetop,
          attr,
          binutils,
          bsd-mailx,
diff --git a/untangle-firmware-common/debian/control b/untangle-firmware-common/debian/control
index 8fc21fd611..a89798ee22 100644
--- a/untangle-firmware-common/debian/control
+++ b/untangle-firmware-common/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-firmware-common
 Architecture: all
-Depends: systemd, rdate, mtd-utils, kmod, udev
+Depends: ${misc:Depends}, systemd, rdate, mtd-utils, kmod, udev
 Conflicts: untangle-hardware-asus-ac88u (<= 12.2.0~vcs20161112~), untangle-hardware-linksys-wrt1900acs (<= 12.2.0~vcs20161112~)
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-gateway/debian/control b/untangle-gateway/debian/control
index 7572d832b4..8762c4c51d 100644
--- a/untangle-gateway/debian/control
+++ b/untangle-gateway/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-gateway
 Architecture: any
-Depends: chromium-driver [!armel !armhf !arm64],
+Depends: ${misc:Depends}, chromium-driver [!armel !armhf !arm64],
 	 chromium [!armel !armhf !arm64],
          libpam-systemd,
 	 nano,
diff --git a/untangle-geoip-database/debian/control b/untangle-geoip-database/debian/control
index 5cef982678..a5831ba5fd 100644
--- a/untangle-geoip-database/debian/control
+++ b/untangle-geoip-database/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-geoip-database
 Architecture: all
-Depends: gzip, wget
+Depends: ${misc:Depends}, gzip, wget
 Description: The Untangle Geography Manager database
  The Untangle Geography Manager database and update script.
 
diff --git a/untangle-hardware-amazon-ec2/debian/control b/untangle-hardware-amazon-ec2/debian/control
index ea7648574b..de24c194db 100644
--- a/untangle-hardware-amazon-ec2/debian/control
+++ b/untangle-hardware-amazon-ec2/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-amazon-ec2
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-snort-config, untangle-system-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-snort-config, untangle-system-config
 Description: The Untangle Amazon EC2 config
  Configuration specific to Amazon EC2.
 
diff --git a/untangle-hardware-asus-ac88u/debian/control b/untangle-hardware-asus-ac88u/debian/control
index 1e02d110e4..c9318f0350 100644
--- a/untangle-hardware-asus-ac88u/debian/control
+++ b/untangle-hardware-asus-ac88u/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-asus-ac88u
 Architecture: all
-Depends: systemd, untangle-firmware-common, untangle-broadcom-wireless, untangle-linux-image-4.4-asus-ac88u
+Depends: ${misc:Depends}, systemd, untangle-firmware-common, untangle-broadcom-wireless, untangle-linux-image-4.4-asus-ac88u
 Conflicts: untangle-firmware-common (< 12.2.0~vcs20161118~)
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-config/debian/control b/untangle-hardware-config/debian/control
index 7bdb03ed89..c93c9cfb6f 100644
--- a/untangle-hardware-config/debian/control
+++ b/untangle-hardware-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-config
 Architecture: all
-Depends: systemd-sysv
+Depends: ${misc:Depends}, systemd-sysv
 Conflicts: sysvinit-core
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-jetway-u50w/debian/control b/untangle-hardware-jetway-u50w/debian/control
index 957e64e200..8f6b418970 100644
--- a/untangle-hardware-jetway-u50w/debian/control
+++ b/untangle-hardware-jetway-u50w/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-jetway-u50w
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-lanner-m1500/debian/control b/untangle-hardware-lanner-m1500/debian/control
index ddac9bc077..91a846374e 100644
--- a/untangle-hardware-lanner-m1500/debian/control
+++ b/untangle-hardware-lanner-m1500/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-m1500
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-lanner-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-lanner-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-lanner-m3000/debian/control b/untangle-hardware-lanner-m3000/debian/control
index dd76a0f273..3693fd9139 100644
--- a/untangle-hardware-lanner-m3000/debian/control
+++ b/untangle-hardware-lanner-m3000/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-m3000
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-lanner-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-lanner-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-lanner-u150/debian/control b/untangle-hardware-lanner-u150/debian/control
index da76093a1d..a325e434e1 100644
--- a/untangle-hardware-lanner-u150/debian/control
+++ b/untangle-hardware-lanner-u150/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-u150
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-lanner-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-lanner-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-lanner-u25/debian/control b/untangle-hardware-lanner-u25/debian/control
index cb0561db94..7479992de4 100644
--- a/untangle-hardware-lanner-u25/debian/control
+++ b/untangle-hardware-lanner-u25/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-u25
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-lanner-u25w/debian/control b/untangle-hardware-lanner-u25w/debian/control
index 39fb4d74e4..2b415f8d31 100644
--- a/untangle-hardware-lanner-u25w/debian/control
+++ b/untangle-hardware-lanner-u25w/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-u25w
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-lanner-u50/debian/control b/untangle-hardware-lanner-u50/debian/control
index c3475f530f..f974301278 100644
--- a/untangle-hardware-lanner-u50/debian/control
+++ b/untangle-hardware-lanner-u50/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-u50
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-lanner-u500/debian/control b/untangle-hardware-lanner-u500/debian/control
index 9a0df747b9..85b6cad6f9 100644
--- a/untangle-hardware-lanner-u500/debian/control
+++ b/untangle-hardware-lanner-u500/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-lanner-u500
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-lanner-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-lanner-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-linksys-wrt1900acs/debian/control b/untangle-hardware-linksys-wrt1900acs/debian/control
index 837bb91c5d..3a75b530a1 100644
--- a/untangle-hardware-linksys-wrt1900acs/debian/control
+++ b/untangle-hardware-linksys-wrt1900acs/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-linksys-wrt1900acs
 Architecture: all
-Depends: systemd, untangle-firmware-common, untangle-linux-image-4.9-linksys-wrt1900acs
+Depends: ${misc:Depends}, systemd, untangle-firmware-common, untangle-linux-image-4.9-linksys-wrt1900acs
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-linksys-wrt3200acm/debian/control b/untangle-hardware-linksys-wrt3200acm/debian/control
index d1d224e1cc..e9db57af2b 100644
--- a/untangle-hardware-linksys-wrt3200acm/debian/control
+++ b/untangle-hardware-linksys-wrt3200acm/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-linksys-wrt3200acm
 Architecture: all
-Depends: systemd, untangle-firmware-common, untangle-linux-image-4.9-linksys-wrt3200acm
+Depends: ${misc:Depends}, systemd, untangle-firmware-common, untangle-linux-image-4.9-linksys-wrt3200acm
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-portwell-m1500/debian/control b/untangle-hardware-portwell-m1500/debian/control
index c7aa0f6bfe..8c54d395b3 100644
--- a/untangle-hardware-portwell-m1500/debian/control
+++ b/untangle-hardware-portwell-m1500/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-portwell-m1500
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-portwell-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-portwell-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-portwell-m3000/debian/control b/untangle-hardware-portwell-m3000/debian/control
index 48bd4e946d..7e4bbbe922 100644
--- a/untangle-hardware-portwell-m3000/debian/control
+++ b/untangle-hardware-portwell-m3000/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-portwell-m3000
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-portwell-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-portwell-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-portwell-u10/debian/control b/untangle-hardware-portwell-u10/debian/control
index 8f40fbad12..516d43bcf9 100644
--- a/untangle-hardware-portwell-u10/debian/control
+++ b/untangle-hardware-portwell-u10/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-portwell-u10
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-portwell-u150/debian/control b/untangle-hardware-portwell-u150/debian/control
index c75708d6fd..6084d4ae07 100644
--- a/untangle-hardware-portwell-u150/debian/control
+++ b/untangle-hardware-portwell-u150/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-portwell-u150
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-portwell-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-portwell-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-portwell-u50/debian/control b/untangle-hardware-portwell-u50/debian/control
index 6c61224cd1..6fcb329ada 100644
--- a/untangle-hardware-portwell-u50/debian/control
+++ b/untangle-hardware-portwell-u50/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-portwell-u50
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-portwell-u500/debian/control b/untangle-hardware-portwell-u500/debian/control
index 9c7f2dbf1d..5e745a65fe 100644
--- a/untangle-hardware-portwell-u500/debian/control
+++ b/untangle-hardware-portwell-u500/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-portwell-u500
 Architecture: all
-Depends: systemd, untangle-hardware-config, untangle-portwell-lcd
+Depends: ${misc:Depends}, systemd, untangle-hardware-config, untangle-portwell-lcd
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-hardware-qotom-u25x/debian/control b/untangle-hardware-qotom-u25x/debian/control
index 2415dfb774..4b852a839b 100644
--- a/untangle-hardware-qotom-u25x/debian/control
+++ b/untangle-hardware-qotom-u25x/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-qotom-u25x
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-qotom-u25xw/debian/control b/untangle-hardware-qotom-u25xw/debian/control
index fd81544301..86c58cef18 100644
--- a/untangle-hardware-qotom-u25xw/debian/control
+++ b/untangle-hardware-qotom-u25xw/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-qotom-u25xw
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-qotom-u50x/debian/control b/untangle-hardware-qotom-u50x/debian/control
index 207b15f09d..415616b754 100644
--- a/untangle-hardware-qotom-u50x/debian/control
+++ b/untangle-hardware-qotom-u50x/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-qotom-u50x
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-qotom-u50xw/debian/control b/untangle-hardware-qotom-u50xw/debian/control
index ff17159fbc..de97973895 100644
--- a/untangle-hardware-qotom-u50xw/debian/control
+++ b/untangle-hardware-qotom-u50xw/debian/control
@@ -7,7 +7,7 @@ Build-Depends: systemd, debhelper (>= 10)
 Standards-Version: 3.9.8
 
 Package: untangle-hardware-qotom-u50xw
-Depends: systemd, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, untangle-hardware-config
 Architecture: all
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
diff --git a/untangle-hardware-turris-omnia/debian/control b/untangle-hardware-turris-omnia/debian/control
index 65b409ca01..6a7f3db2d2 100644
--- a/untangle-hardware-turris-omnia/debian/control
+++ b/untangle-hardware-turris-omnia/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-hardware-turris-omnia
 Architecture: all
-Depends: systemd, untangle-firmware-common, firmware-atheros (>= 20161130-1), untangle-linux-image-4.4-turris-omnia, watchdog
+Depends: ${misc:Depends}, systemd, untangle-firmware-common, firmware-atheros (>= 20161130-1), untangle-linux-image-4.4-turris-omnia, watchdog
 Description: The Untangle hardware config
  Provides the mechanism for other packages to register startup
  actions, to load hardware-related settings at boot time.
diff --git a/untangle-kernel-modules-stretch-amd64/debian/control b/untangle-kernel-modules-stretch-amd64/debian/control
index 1a6a476e07..efb2a20514 100644
--- a/untangle-kernel-modules-stretch-amd64/debian/control
+++ b/untangle-kernel-modules-stretch-amd64/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-kernel-modules-stretch-amd64
 Architecture: amd64
-Depends: linux-image-4.9.0-6-untangle-amd64, firmware-bnx2, firmware-bnx2x
+Depends: ${misc:Depends}, linux-image-4.9.0-6-untangle-amd64, firmware-bnx2, firmware-bnx2x
 Provides: untangle-kernel-modules-stretch
 Pre-Depends: untangle-debconf-manager
 Description: The Untangle kernel modules for amd64
diff --git a/untangle-kernel-modules-stretch-i386/debian/control b/untangle-kernel-modules-stretch-i386/debian/control
index a88772fa4c..1b02dc6a34 100644
--- a/untangle-kernel-modules-stretch-i386/debian/control
+++ b/untangle-kernel-modules-stretch-i386/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-kernel-modules-stretch-i386
 Architecture: i386
-Depends: linux-image-4.9.0-6-untangle-686-pae, firmware-bnx2, firmware-bnx2x
+Depends: ${misc:Depends}, linux-image-4.9.0-6-untangle-686-pae, firmware-bnx2, firmware-bnx2x
 Provides: untangle-kernel-modules-stretch
 Pre-Depends: untangle-debconf-manager
 Description: The Untangle kernel modules for i386
diff --git a/untangle-kiosk/debian/control b/untangle-kiosk/debian/control
index 462106896d..3bbe087493 100644
--- a/untangle-kiosk/debian/control
+++ b/untangle-kiosk/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-kiosk
 Architecture: all
-Depends: acpi-support-base,
+Depends: ${misc:Depends}, acpi-support-base,
          adduser,
          chromium,
 	 fbpanel,
diff --git a/untangle-linux-config/debian/control b/untangle-linux-config/debian/control
index 2a2e65a50b..0b800de72a 100644
--- a/untangle-linux-config/debian/control
+++ b/untangle-linux-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-linux-config
 Architecture: i386 amd64
-Depends: bash (>= 3.1),
+Depends: ${misc:Depends}, bash (>= 3.1),
          firmware-linux-free,
          firmware-linux-nonfree,
          grub-pc,
diff --git a/untangle-lxc-client/debian/control b/untangle-lxc-client/debian/control
index 323cf745bf..30d310ae6f 100644
--- a/untangle-lxc-client/debian/control
+++ b/untangle-lxc-client/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-lxc-client
 Architecture: any
-Depends: systemd, dpkg-dev, lxc, cgroupfs-mount, untangle-sync-settings, sudo, wget, rsync, openssh-server
+Depends: ${misc:Depends}, systemd, dpkg-dev, lxc, cgroupfs-mount, untangle-sync-settings, sudo, wget, rsync, openssh-server
 Description: The Untangle LXC client
  Provides the basic setup for putting an LXC container "behind" a
  local Untangle VM install
diff --git a/untangle-nflogd/debian/control b/untangle-nflogd/debian/control
index 280d607e3a..ba687b5e0b 100644
--- a/untangle-nflogd/debian/control
+++ b/untangle-nflogd/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-nflogd
 Architecture: any
-Depends: libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), libnetfilter-log1 (>= 1.0.0), ${misc:Depends}, systemd-sysv
+Depends: ${misc:Depends}, libc6 (>= 2.4), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.1.1), libnetfilter-log1 (>= 1.0.0), ${misc:Depends}, systemd-sysv
 Conflicts: sysvinit-core
 Description: The Untangle NetFilter Log Daemon
  A daemon that handles iptables NFLOG target packets.
diff --git a/untangle-nsis-addons/debian/control b/untangle-nsis-addons/debian/control
index f198b499e1..3efc8f795c 100644
--- a/untangle-nsis-addons/debian/control
+++ b/untangle-nsis-addons/debian/control
@@ -8,6 +8,6 @@ Standards-Version: 3.9.8
 
 Package: untangle-nsis-addons
 Architecture: all
-Depends: nsis (>= 2.06-6) | oracle-java8-jdk
+Depends: ${misc:Depends}, nsis (>= 2.06-6) | oracle-java8-jdk
 Description: Packages to complete the NSIS installation generator utility
  Addons for the Untangle NSIS installation.
diff --git a/untangle-postgresql-config/debian/control b/untangle-postgresql-config/debian/control
index cfdddf9206..a3da3a95ff 100644
--- a/untangle-postgresql-config/debian/control
+++ b/untangle-postgresql-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-postgresql-config
 Architecture: i386 amd64 arm64
-Depends: systemd, procps (>= 3.2.7-2~bpo.1), untangle-hardware-config, postgresql-client-9.6, postgresql-9.6
+Depends: ${misc:Depends}, systemd, procps (>= 3.2.7-2~bpo.1), untangle-hardware-config, postgresql-client-9.6, postgresql-9.6
 Description: Untangle Postgres wrapper package
  The Untangle Postgres config for Postgres 8.3
 
diff --git a/untangle-pyconnector/debian/control b/untangle-pyconnector/debian/control
index 36f791d520..72a33b57eb 100644
--- a/untangle-pyconnector/debian/control
+++ b/untangle-pyconnector/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-pyconnector
 Architecture: all
-Depends: systemd, python3, systemd-sysv
+Depends: ${misc:Depends}, systemd, python3, systemd-sysv
 Conflicts: sysvinit-core
 Breaks: untangle-vm (<< 14.0.0.20180307T1008050800.9066580463-1stretch)
 Replaces: untangle-vm (<< 14.0.0.20180307T1008050800.9066580463-1stretch)
diff --git a/untangle-python-sync-settings/debian/control b/untangle-python-sync-settings/debian/control
index ae160f0807..49e48e3dd6 100644
--- a/untangle-python-sync-settings/debian/control
+++ b/untangle-python-sync-settings/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: https://github.com/untangle/ngfw_pkgs.git
 
 Package: untangle-python3-sync-settings
 Architecture: all
-Depends: ${misc:Depends}, ${python3:Depends}
+Depends: ${misc:Depends}, ${misc:Depends}, ${python3:Depends}
 Description: Library for manipulating Untangle system settings (Python 3)
  This module is a Library for manipulating Untangle system settings.
  .
diff --git a/untangle-root/debian/control b/untangle-root/debian/control
index eadb97d675..a9ac2b5032 100644
--- a/untangle-root/debian/control
+++ b/untangle-root/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-root
 Architecture: all
-Depends: less,
+Depends: ${misc:Depends}, less,
 	 rsync,
          sudo,
 	 zsh
diff --git a/untangle-snmpd-config/debian/control b/untangle-snmpd-config/debian/control
index 22084fefb2..389d6ca085 100644
--- a/untangle-snmpd-config/debian/control
+++ b/untangle-snmpd-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-snmpd-config
 Architecture: all
-Depends: systemd, snmpd, snmp
+Depends: ${misc:Depends}, systemd, snmpd, snmp
 Description: Untangle snmpd wrapper package
  The Untangle snmpd autoconfigurator
 
diff --git a/untangle-snort-config/debian/control b/untangle-snort-config/debian/control
index a5a0d65f95..a55c0c8bc3 100644
--- a/untangle-snort-config/debian/control
+++ b/untangle-snort-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-snort-config
 Architecture: all
-Depends: systemd, snort (>= 2.9.7.0), libdaq0
+Depends: ${misc:Depends}, systemd, snort (>= 2.9.7.0), libdaq0
 Conflicts: untangle-snort-rules
 Replaces: untangle-snort-rules
 Provides: untangle-snort-rules
diff --git a/untangle-softflowd-config/debian/control b/untangle-softflowd-config/debian/control
index cb5b80ee48..85c2e02757 100644
--- a/untangle-softflowd-config/debian/control
+++ b/untangle-softflowd-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-softflowd-config
 Architecture: all
-Depends: systemd, softflowd
+Depends: ${misc:Depends}, systemd, softflowd
 Description: Untangle softflowd wrapper package
  The Untangle softflowd autoconfigurator
 
diff --git a/untangle-spamassassin-update/debian/control b/untangle-spamassassin-update/debian/control
index 91e19fd25c..57493af48e 100644
--- a/untangle-spamassassin-update/debian/control
+++ b/untangle-spamassassin-update/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-spamassassin-update
 Architecture: all
-Depends: systemd, spamassassin (>= 3.1.7), libnet-dns-perl, libmailtools-perl, libhtml-format-perl, libwww-perl, libarchive-tar-perl, libio-zlib-perl, libmail-spf-perl, libnet-ident-perl, razor, libsys-hostname-long-perl, libhtml-parser-perl,  libdigest-sha-perl, re2c, adduser, untangle-hardware-config
+Depends: ${misc:Depends}, systemd, spamassassin (>= 3.1.7), libnet-dns-perl, libmailtools-perl, libhtml-format-perl, libwww-perl, libarchive-tar-perl, libio-zlib-perl, libmail-spf-perl, libnet-ident-perl, razor, libsys-hostname-long-perl, libhtml-parser-perl,  libdigest-sha-perl, re2c, adduser, untangle-hardware-config
 Conflicts: fuzzyocr
 Recommends: libsys-syslog-perl, libmail-dkim-perl
 Description: The Untangle Spamassassin update utilities
diff --git a/untangle-squid-config/debian/control b/untangle-squid-config/debian/control
index a055d14d09..a787a582f5 100644
--- a/untangle-squid-config/debian/control
+++ b/untangle-squid-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-squid-config
 Architecture: all
-Depends: squid, bc
+Depends: ${misc:Depends}, squid, bc
 Conflicts: squid3
 Description: The Untangle Squid config
  The Untangle Squid config.
diff --git a/untangle-stunnel-config/debian/control b/untangle-stunnel-config/debian/control
index e141d95551..0bda52d1f3 100644
--- a/untangle-stunnel-config/debian/control
+++ b/untangle-stunnel-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-stunnel-config
 Architecture: all
-Depends: systemd, stunnel4, bc, xinetd, update-inetd, libfile-copy-recursive-perl
+Depends: ${misc:Depends}, systemd, stunnel4, bc, xinetd, update-inetd, libfile-copy-recursive-perl
 Description: The Untangle stunnel configuration
  The Untangle stunnel configuration.
 
diff --git a/untangle-sync-settings/debian/control b/untangle-sync-settings/debian/control
index c4ee70397c..b394d525d4 100644
--- a/untangle-sync-settings/debian/control
+++ b/untangle-sync-settings/debian/control
@@ -11,7 +11,7 @@ Architecture: all
 Conflicts: untangle-netd
 Replaces: untangle-netd
 Provides: untangle-netd
-Depends: bridge-utils,
+Depends: ${misc:Depends}, bridge-utils,
          crda,
          dash,
          isc-dhcp-client,
diff --git a/untangle-system-config/debian/control b/untangle-system-config/debian/control
index a657621e51..cce75237d6 100644
--- a/untangle-system-config/debian/control
+++ b/untangle-system-config/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.8
 
 Package: untangle-system-config
 Architecture: all
-Depends: systemd, debconf, untangle-vm, irqbalance
+Depends: ${misc:Depends}, systemd, debconf, untangle-vm, irqbalance
 Description: The Untangle system config
  The Untangle system configurator.  Top level configurations not belonging in
  a more specific configurator are here.  Also if this package is present at