From b0350dbc40d3bc442f02bbd5980e2c2b5d83194d Mon Sep 17 00:00:00 2001 From: jfarrell Date: Wed, 9 Jul 2014 23:39:34 -0400 Subject: [PATCH] Thrift-2601:Fix vagrant to work again for builds again Client: build process Patch: jfarrell Updates debian packaging to work with ubuntu 14.04 deps --- debian/control | 6 +++--- debian/docs | 2 +- debian/rules | 1 - 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/debian/control b/debian/control index 6ec66146..39d57f99 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ 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, autoconf, python-support, - automake, pkg-config, libtool, bison, flex, libboost-dev | libboost1.40-dev, python-all, + mono-devel, libmono-system-web2.0-cil, erlang-base, ruby1.8-dev, autoconf, automake, + pkg-config, libtool, bison, flex, libboost-dev | libboost1.40-dev, python-all, python-all-dev, python-all-dbg, openjdk-6-jdk | java-sdk, libboost-test-dev | libboost-test1.40-dev, libevent-dev, perl (>= 5.8.0-7), php5, php5-dev, libglib2.0-dev, libqt4-dev @@ -12,7 +12,7 @@ Homepage: http://thrift.apache.org/ Vcs-Git: https://git-wip-us.apache.org/repos/asf/thrift.git Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=thrift.git Standards-Version: 3.7.2 -XS-Python-Version: >= 2.4 +X-Python-Version: >= 2.6 Package: thrift-compiler Architecture: any diff --git a/debian/docs b/debian/docs index e845566c..b43bf86b 100644 --- a/debian/docs +++ b/debian/docs @@ -1 +1 @@ -README +README.md diff --git a/debian/rules b/debian/rules index 8995f9c3..633b17e6 100755 --- a/debian/rules +++ b/debian/rules @@ -186,7 +186,6 @@ binary-common: dh_strip -Npython-thrift-dbg dh_compress dh_fixperms - dh_pysupport dh_makeshlibs dh_installdeb dh_perl -- 2.17.1