summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjfarrell <jfarrell@apache.org>2013-08-18 11:20:53 -0400
committerjfarrell <jfarrell@apache.org>2013-08-18 11:20:53 -0400
commit2fa3df32cef7f8b490f3389ca43ce249bfb43bf0 (patch)
tree686285e5a32152e246c95abde4a335c65a5e7adb
parent5a900eadc2163e3f92ca71fea23996b517def078 (diff)
downloadthrift-2fa3df32cef7f8b490f3389ca43ce249bfb43bf0.tar.gz
Thrift-2136:Vagrant build not compiling java, ruby, php, go libs
Client: build Patch: jfarrell Updating to add deb package creation.
-rw-r--r--contrib/Vagrantfile6
-rw-r--r--debian/control2
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/Vagrantfile b/contrib/Vagrantfile
index ef518bf6c..fd6782184 100644
--- a/contrib/Vagrantfile
+++ b/contrib/Vagrantfile
@@ -28,10 +28,10 @@ sudo apt-get upgrade -qq -y
# Install Dependencies
# ---
# General dependencies
-sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev git
+sudo apt-get install -qq libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev automake libtool flex bison pkg-config g++ libssl-dev make libqt4-dev git debhelper
# Java dependencies
-sudo apt-get install -qq ant openjdk-7-jdk
+sudo apt-get install -qq ant openjdk-7-jdk libcommons-lang3-java
# Python dependencies
sudo apt-get install -qq python-all python-all-dev python-all-dbg python-setuptools
@@ -44,7 +44,7 @@ sudo gem install bundler rake
sudo apt-get install -qq libbit-vector-perl
# Php dependencies
-sudo apt-get install -qq php5-dev php5-cli php-pear
+sudo apt-get install -qq php5 php5-dev php5-cli php-pear
# GlibC dependencies
sudo apt-get install -qq libglib2.0-dev
diff --git a/debian/control b/debian/control
index fa888bf08..84e545eb5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: thrift
Section: devel
Priority: extra
Build-Depends: debhelper (>= 5), build-essential, mono-gmcs, python-dev, ant,
- mono-devel, libmono-system-web2.0-cil, erlang-base, ruby1.8-dev, mongrel, autoconf, python-support,
+ mono-devel, libmono-system-web2.0-cil, erlang-base, ruby1.8-dev, autoconf, python-support,
automake, pkg-config, libtool, bison, flex, libboost-dev | libboost1.40-dev, python-all,
python-all-dev, python-all-dbg, openjdk-6-jdk | java-sdk, libcommons-lang3-java,
libboost-test-dev | libboost-test1.40-dev, libevent-dev, perl (>= 5.8.0-7),