diff options
| author | Daniil Baturin <daniil@baturin.org> | 2018-11-12 16:57:22 +0100 |
|---|---|---|
| committer | Daniil Baturin <daniil@baturin.org> | 2018-11-12 16:57:22 +0100 |
| commit | 559ac84addd27c135f5799304434ad3ef872555d (patch) | |
| tree | 5d06f61b62ff69760d83f63ca42927f7f61d1d1f /debian | |
| parent | 7e6e5a211325b8f00e58a01a67ad2c01d073ff2a (diff) | |
| parent | 718d9a123c2ba72b87d7f6e48a5e6d83fa86d494 (diff) | |
| download | vyos-1x-559ac84addd27c135f5799304434ad3ef872555d.tar.gz vyos-1x-559ac84addd27c135f5799304434ad3ef872555d.zip | |
Merge branch 'current' into crux
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 1 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index d60c36316..1db603fe5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ +vyos-1x (1.2.0-5) unstable; urgency=medium + + * T835: accel-ppp: pppoe implementation + + -- hagbard <vyosdev@derith.de> Fri, 09 Nov 2018 10:49:48 -0800 + vyos-1x (1.2.0-4) unstable; urgency=medium * T240 adds feature system integrity check -- hagbard <vyosdev@derith.de> Mon, 29 Oct 2018 11:10:18 -0700 + vyos-1x (1.2.0-3) unstable; urgency=medium * T933: adding vmac_xmit_base if use_vmac has been chosen diff --git a/debian/control b/debian/control index 05b4f5320..a68598fd5 100644 --- a/debian/control +++ b/debian/control @@ -46,6 +46,7 @@ Depends: python3, keepalived (>=2.0.5), wireguard, tftpd-hpa, + igmpproxy, ${shlibs:Depends}, ${misc:Depends} Description: VyOS configuration scripts and data diff --git a/debian/rules b/debian/rules index 15dfec551..663aff4d9 100755 --- a/debian/rules +++ b/debian/rules @@ -64,3 +64,7 @@ override_dh_auto_install: # Install data files mkdir -p $(DIR)/$(VYOS_DATA_DIR) cp -r data/* $(DIR)/$(VYOS_DATA_DIR) + + # Install etc configuration files + mkdir -p $(DIR)/etc + cp -r src/etc/* $(DIR)/etc |