diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:34:31 +0200 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-06-24 12:34:31 +0200 |
| commit | fbc72527765b236a65740cd5d9f7f2c3f7e9a87e (patch) | |
| tree | 13c5bd2858ff8fb561f3057c970821c7d503cc99 /debian | |
| parent | 7d1875d601e0c975f1ab7ae57f7595b49e401390 (diff) | |
| parent | 96a8f5e74295e3a06bb8c2ca92e1b35597db9377 (diff) | |
| download | vyatta-cfg-firewall-lithium.tar.gz vyatta-cfg-firewall-lithium.zip | |
Merge branch 'current' into lithiumlithium
Conflicts:
debian/changelog
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 16 | ||||
| -rw-r--r-- | debian/control | 6 |
2 files changed, 17 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index c51a0ce..c0b54d9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,18 @@ -vyatta-cfg-firewall (0.14.0+vyos2+lithium17) unstable; urgency=low +vyatta-cfg-firewall (0.14.0+vyos2+lithium17) UNRELEASED; urgency=medium - * Remove dead code from the IPset module. + * Sync with current. - -- Daniil Baturin <daniil@baturin.org> Tue, 22 Dec 2015 21:38:37 +0100 + -- Daniil Baturin <daniil@baturin.org> Sun, 24 Jun 2018 12:31:12 +0200 + +vyatta-cfg-firewall (0.14.0+vyos2+current1) unstable; urgency=medium + + [ Thomas Jepp ] + * Fix build depends. + * Fix runtime depends. + + [ Kim Hagen ] + + -- Kim Hagen <kim.sidney@gmail.com> Sun, 24 Jan 2016 15:00:40 -0500 vyatta-cfg-firewall (0.14.0+vyos2+lithium16) unstable; urgency=low diff --git a/debian/control b/debian/control index 335bd13..7e6cadd 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: vyatta-cfg-firewall Section: contrib/net Priority: extra Maintainer: VyOS Package Maintainers <maintainers@vyos.net> -Build-Depends: debhelper (>= 5), autotools-dev +Build-Depends: debhelper (>= 5), autotools-dev, autoconf, automake, cpio Standards-Version: 3.9.1 Package: vyatta-cfg-firewall @@ -23,7 +23,9 @@ Depends: sed (>= 4.1.5), sudo, snmpd, ipset, - iptables + iptables, + libswitch-perl, + libsnmp-perl Replaces: vyatta-cfg-system, vyatta-openvpn, vyatta-wirelessmodem |