diff options
| author | Nobuaki Sukegawa <nsuke@apache.org> | 2015-11-28 15:04:39 +0900 |
|---|---|---|
| committer | Nobuaki Sukegawa <nsuke@apache.org> | 2015-12-05 11:28:27 +0900 |
| commit | a6ab1f5e6d8c5f8c64d356d72993a423cc2bf588 (patch) | |
| tree | 13c2f9427494700526ea9149a9d6c233dfa8550a /debian | |
| parent | 1a32c3b93fb8fc5c48d7fe8ee22398b073d812d6 (diff) | |
| download | thrift-a6ab1f5e6d8c5f8c64d356d72993a423cc2bf588.tar.gz | |
THRIFT-3452 .travis.yml: Migrating from legacy to container-based infrastructure
Client: Build
Patch: Nobuaki Sukegawa
Use "services: docker"
This closes #730
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/control | 10 | ||||
| -rwxr-xr-x | debian/rules | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/debian/control b/debian/control index 39d57f997..7f997b236 100644 --- a/debian/control +++ b/debian/control @@ -2,10 +2,10 @@ 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, automake, - pkg-config, libtool, bison, flex, libboost-dev | libboost1.40-dev, python-all, + mono-devel, libmono-system-web2.0-cil, erlang-base, ruby-dev | ruby1.9.1-dev, autoconf, automake, + pkg-config, libtool, bison, flex, libboost-dev | libboost1.53-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), + libboost-test-dev | libboost-test1.53-dev, libevent-dev, perl (>= 5.8.0-7), php5, php5-dev, libglib2.0-dev, libqt4-dev Maintainer: Thrift Developer's <dev@thrift.apache.org> Homepage: http://thrift.apache.org/ @@ -29,8 +29,8 @@ Description: Compiler for Thrift definition files Package: python-thrift Architecture: any Section: python -Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} -Recommends: python-twisted-core +Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}, python-six +Recommends: python-twisted-web Provides: ${python:Provides} Description: Python bindings for Thrift Thrift is a software framework for scalable cross-language services diff --git a/debian/rules b/debian/rules index d8462d194..c94de2ea6 100755 --- a/debian/rules +++ b/debian/rules @@ -107,11 +107,6 @@ install-indep: $(CURDIR)/debian/libthrift-java/usr/share/java/ # Ruby - mkdir -p $(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.8 && \ - cp $(CURDIR)/lib/rb/lib/thrift.rb \ - $(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.8 - cp -r $(CURDIR)/lib/rb/lib/thrift \ - $(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.8 mkdir -p $(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.9.1 && \ cp $(CURDIR)/lib/rb/lib/thrift.rb \ $(CURDIR)/debian/ruby-thrift/usr/lib/ruby/1.9.1 |