You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2014/07/10 05:40:37 UTC

[3/3] git commit: Thrift-2601:Fix vagrant to work again for builds again Client: build process Patch: jfarrell

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


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/b0350dbc
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/b0350dbc
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/b0350dbc

Branch: refs/heads/master
Commit: b0350dbc40d3bc442f02bbd5980e2c2b5d83194d
Parents: dbf2bb5
Author: jfarrell <jf...@apache.org>
Authored: Wed Jul 9 23:39:34 2014 -0400
Committer: jfarrell <jf...@apache.org>
Committed: Wed Jul 9 23:39:34 2014 -0400

----------------------------------------------------------------------
 debian/control | 6 +++---
 debian/docs    | 2 +-
 debian/rules   | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/b0350dbc/debian/control
----------------------------------------------------------------------
diff --git a/debian/control b/debian/control
index 6ec6614..39d57f9 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

http://git-wip-us.apache.org/repos/asf/thrift/blob/b0350dbc/debian/docs
----------------------------------------------------------------------
diff --git a/debian/docs b/debian/docs
index e845566..b43bf86 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README
+README.md

http://git-wip-us.apache.org/repos/asf/thrift/blob/b0350dbc/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index 8995f9c..633b17e 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