summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-23 20:53:28 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-23 20:53:28 +0100
commitc33cb44a4db80055250b96b31a950b0495b3f7d0 (patch)
treeb3e2a5a2f754d60ca106ca6f6b34cb66b3b1ac3c
parent1ca1e09df4b5b6acca0afeae91180d7f0a1d47e4 (diff)
parenta76430998828c1d92271d763b5cbacc642108743 (diff)
downloadvyos-world-c33cb44a4db80055250b96b31a950b0495b3f7d0.tar.gz
vyos-world-c33cb44a4db80055250b96b31a950b0495b3f7d0.zip
Merge branch 'current' into equuleus
* current: wireless: T1627: initial rewrite in XML/Python style Update changelog. Remove Intel's e1000e package from dependencies. Jenkins: import Pipeline from vyos-1x commit bd00ec7
-rw-r--r--debian/control4
1 files changed, 2 insertions, 2 deletions
diff --git a/debian/control b/debian/control
index eaa48d1..41815f3 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,9 @@ Standards-Version: 3.9.1
Package: vyos-world
Architecture: all
Depends: vyatta-cfg-system,
+ vyatta-bash,
vyatta-op,
+ vyatta-cfg,
vyatta-config-mgmt,
vyatta-cfg-firewall,
vyatta-op-firewall,
@@ -29,10 +31,8 @@ Depends: vyatta-cfg-system,
vyatta-ravpn,
vyatta-wanloadbalance,
vyatta-webproxy,
- vyatta-wireless,
vyatta-wirelessmodem,
vyatta-zone,
- vyos-intel-e1000e,
vyos-intel-i40e,
vyos-intel-i40evf,
vyos-intel-igb,