From 0c27352179e0463bde1f68757f2d77e3c222f530 Mon Sep 17 00:00:00 2001 From: jfarrell Date: Mon, 19 Dec 2016 14:57:54 -0500 Subject: THRIFT-3999: Fix debian package set up scripts Client: build Patch: Akira Nakagawa debian/control has typo and missing packages and it prevents building packages. --- debian/control | 8 ++++---- debian/rules | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index ad297902a..43e7a0faf 100644 --- a/debian/control +++ b/debian/control @@ -2,18 +2,18 @@ Source: thrift Section: devel Priority: extra Build-Depends: debhelper (>= 9), build-essential, mono-mcs, python-dev, ant, - mono-devel, libmono-system-web4.0-cil, erlang-base, ruby-dev | ruby1.9.1-dev, autoconf, automake, + mono-devel, libmono-system-web4.0-cil, erlang-base, ruby-dev | ruby1.9.1-dev, ruby-bundler ,autoconf, automake, pkg-config, libtool, bison, flex, libboost-dev | libboost1.53-dev, python-all, python-setuptools, python-all-dev, python-all-dbg, python3-all, python3-setuptools, python3-all-dev, python3-all-dbg, openjdk-7-jdk | openjdk-8-jdk | default-jdk, libboost-test-dev | libboost-test1.53-dev, libevent-dev, libssl-dev, perl (>= 5.8.0-7), - php5 | php-7.0, php5-dev | php-7.0-dev, libglib2.0-dev, qtbase5-dev, qtbase5-dev-tools + php5 | php7.0, php5-dev | php7.0-dev, libglib2.0-dev, qtchooser, qtbase5-dev-tools Maintainer: Thrift Developer's 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.9.5 +Standards-Version: 3.9.7 X-Python-Version: >= 2.6 X-Python3-Version: >= 3.3 @@ -115,7 +115,7 @@ Description: Ruby bindings for Thrift Package: libthrift-java Architecture: all Section: java -Depends: java-gcj-compat | java1-runtime | java2-runtime, ${misc:Depends} +Depends: ${misc:Depends} Description: Java bindings for Thrift Thrift is a software framework for scalable cross-language services development. It combines a software stack with a code generation engine to diff --git a/debian/rules b/debian/rules index 84cba1f10..adecf0777 100755 --- a/debian/rules +++ b/debian/rules @@ -96,13 +96,15 @@ clean: # Add here commands to clean up after the build process. -$(MAKE) clean + $(CURDIR)/cleanup.sh + dh_clean install: install-indep install-arch install-indep: dh_testdir dh_testroot - dh_clean -k -i + dh_prep -i dh_installdirs -i # Add here commands to install the indep part of the package into -- cgit v1.2.1