[GRASS-SVN] r70810 - grass/branches/releasebranch_7_2

[svn_grass at osgeo.org]

Author: martinl
Date: 2017-03-28 05:53:51 -0700 (Tue, 28 Mar 2017)
New Revision: 70810

Modified:
   grass/branches/releasebranch_7_2/Vagrantfile
Log:
Vagrantfile: upgrade to xenial (merge r70809 from trunk)

Modified: grass/branches/releasebranch_7_2/Vagrantfile
===================================================================
--- grass/branches/releasebranch_7_2/Vagrantfile	2017-03-28 12:52:18 UTC (rev 70809)
+++ grass/branches/releasebranch_7_2/Vagrantfile	2017-03-28 12:53:51 UTC (rev 70810)
@@ -11,12 +11,12 @@
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   
   vm_ram = ENV['VAGRANT_VM_RAM'] || 1024
-  vm_cpu = ENV['VAGRANT_VM_CPU'] || 2
+  vm_cpu = ENV['VAGRANT_VM_CPU'] || 1
   
-  config.vm.box = "trusty64"
+  config.vm.box = "xenial64"
   
   config.vm.hostname = "grass-gis-vagrant"
-  config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/trusty/current/trusty-server-cloudimg-amd64-vagrant-disk1.box"
+  config.vm.box_url = "https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-vagrant.box"
   config.vm.define "grass-gis-vagrant" do |host|
     
     config.vm.network :forwarded_port, guest: 80, host: 8080
@@ -63,10 +63,10 @@
       "proj-bin",
       "libreadline-dev",
       "libsqlite3-dev",
-      "libwxgtk2.8-dev",
+      "libwxgtk3.0-dev",
       "libxmu-dev",
       "python",
-      "python-wxgtk2.8",
+      "python-wxgtk3.0",
       "python-dev",
       "python-numpy",
       "python-ply",