diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-22 18:04:15 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-22 18:04:15 -0700 |
| commit | 9c7c83a5e701f7efcee11f7ce46361f841dc29b6 (patch) | |
| tree | fd1b505390d3c19441767de2ac7678fb11a63e17 /debian | |
| parent | 4f86a2a56c09f0731e401aa2fe0ae5717f7830c1 (diff) | |
| parent | f279d69e1d3952de1231ecf56d6ebb3023b96645 (diff) | |
| download | vyatta-cfg-system-9c7c83a5e701f7efcee11f7ce46361f841dc29b6.tar.gz vyatta-cfg-system-9c7c83a5e701f7efcee11f7ce46361f841dc29b6.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
debian/control
scripts/install-system
scripts/rl-system.init
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/debian/control b/debian/control index a60e21dd..a66eed0c 100644 --- a/debian/control +++ b/debian/control @@ -7,14 +7,24 @@ Standards-Version: 3.7.2 Package: vyatta-cfg-system Architecture: all -Depends: bash (>= 3.1), - sed (>= 4.1.5), +Depends: sed (>= 4.1.5), perl (>= 5.8.8), procps (>= 1:3.2.7-3), coreutils (>= 5.97-5.3), libpam-radius-auth, - vyatta-cfg, sysv-rc, ntp, sysklogd, busybox, ssh, whois, sudo, - snmpd, keepalived, vyatta-bash, bridge-utils, tshark + vyatta-cfg, + vyatta-bash, + sysv-rc, + ntp, + sysklogd, + busybox, + whois, + sudo, + snmpd, + keepalived, + vyatta-bash, + bridge-utils, + tshark Suggests: util-linux (>= 2.13-5), net-tools, ethtool, |