[mapguide-commits] r8933 - trunk/Tools/Vagrant/packer/scripts/mapguide

[svn_mapguide at osgeo.org]

Author: jng
Date: 2016-04-29 05:49:33 -0700 (Fri, 29 Apr 2016)
New Revision: 8933

Modified:
   trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh
   trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh
Log:
Remove liboss4-salsa-dev from ubuntu pre-requisites. We only installed this library only for the atomic.h that is packaged with this library, which our vagrant build system already copies into the expected location if it doesn't already exist.

Modified: trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh	2016-04-29 12:48:08 UTC (rev 8932)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu32.sh	2016-04-29 12:49:33 UTC (rev 8933)
@@ -2,7 +2,7 @@
 # Set bash as the default shell
 echo "dash    dash/sh boolean false" | sudo debconf-set-selections
 sudo dpkg-reconfigure --frontend=noninteractive dash
-sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix liboss4-salsa-dev libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
+sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
 # For producing .tar.xz archives
 sudo apt-get install -y xz-utils
 # For deb packaging

Modified: trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh
===================================================================
--- trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh	2016-04-29 12:48:08 UTC (rev 8932)
+++ trunk/Tools/Vagrant/packer/scripts/mapguide/ubuntu64.sh	2016-04-29 12:49:33 UTC (rev 8933)
@@ -2,7 +2,7 @@
 # Set bash as the default shell
 echo "dash    dash/sh boolean false" | sudo debconf-set-selections
 sudo dpkg-reconfigure --frontend=noninteractive dash
-sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix liboss4-salsa-dev libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
+sudo apt-get install -y build-essential bison automake libtool libpng-dev libjpeg62-dev libxslt-dev libfreetype6-dev libpcre3-dev openjdk-7-jdk subversion lintian ant scons dos2unix libldap-dev libssl-dev libcurl4-openssl-dev libexpat-dev libmysqlclient-dev unixODBC-dev python-dev libpq-dev libcppunit-dev
 # For producing .tar.xz archives
 sudo apt-get install -y xz-utils
 # For deb packaging