Merge branch 'equuleus' of github.com:vyos/vyos-world into current

* 'equuleus' of github.com:vyos/vyos-world:
  Jenkins: import Pipeline from vyos-1x commit bd00ec7
  Remove vyos-saltminion from the build until saltstack packages are available.
  update Jenkins file for equuleus
  Update changelog and remove obsolete packages.

3 files changed, 5 insertions, 7 deletions

diff --git a/Jenkinsfile b/Jenkinsfile
index 20eb253..b11267e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -73,7 +73,7 @@ pipeline {
     agent {
         docker {
             args '--sysctl net.ipv6.conf.lo.disable_ipv6=0 -e GOSU_UID=1006 -e GOSU_GID=1006'
-            image 'vyos/vyos-build:current'
+            image 'vyos/vyos-build:equuleus'
         }
     }
     options {
diff --git a/debian/changelog b/debian/changelog
index 9b5467a..5229974 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-vyos-world (1.3+dev1) unstable; urgency=medium
+vyos-world (1.3.0+vyos3+equuleus1) unstable; urgency=medium
 
-  * Remove Intel's e1000e package from dependencies.
+  * New branch.
+  * Remove outdated packages.
 
- -- Daniil Baturiun <daniil@baturin.org>  Tue, 08 Oct 2019 13:41:26 +0200
+ -- Daniil Baturin <daniil@baturin.org>  Tue, 23 Jul 2019 12:04:07 -0400
 
 vyos-world (1.2.1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 08014b4..41815f3 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Depends: vyatta-cfg-system,
  vyatta-op,
  vyatta-cfg,
  vyatta-config-mgmt,
- vyatta-config-migrate,
  vyatta-cfg-firewall,
  vyatta-op-firewall,
  vyatta-cfg-op-pppoe,
@@ -25,7 +24,6 @@ Depends: vyatta-cfg-system,
  vyatta-cluster,
  vyatta-conntrack,
  vyatta-conntrack-sync,
- vyatta-eventwatch,
  vyatta-ipv6-rtradv,
  vyatta-lldp,
  vyatta-nat,
@@ -42,7 +40,6 @@ Depends: vyatta-cfg-system,
  vyos-intel-ixgbevf,
  vyos-nhrp,
  vyos-1x,
- vyos-salt-minion,
  vyos-vmwaretools-scripts
 Description: VyOS metapackage
  Installs everything required for VyOS to work