Updated Branches: refs/heads/trunk 15df6691c -> ab6232aea
Update debian packaging for 2.0 Patch by Blair Zajac, reviewed by brandonwilliams for CASSANDRA-5688 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/ab6232ae Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/ab6232ae Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/ab6232ae Branch: refs/heads/trunk Commit: ab6232aea9fe3cdb29ca0f30d86aae80b99b6f82 Parents: 15df669 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Jun 24 11:46:19 2013 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Jun 24 11:46:19 2013 -0500 ---------------------------------------------------------------------- debian/control | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/ab6232ae/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index aa3db32..ac2c98b 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,15 @@ Section: misc Priority: extra Maintainer: Eric Evans <eev...@apache.org> Uploaders: Sylvain Lebresne <slebre...@apache.org> -Build-Depends: debhelper (>= 5), openjdk-6-jdk (>= 6b11) | java6-sdk, ant (>= 1.7), ant-optional (>= 1.7), subversion, python-support +Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-sdk, ant (>= 1.7), ant-optional (>= 1.7), python-support Homepage: http://cassandra.apache.org -Vcs-Svn: https://svn.apache.org/repos/asf/cassandra/trunk -Vcs-Browser: http://svn.apache.org/viewvc/cassandra/trunk +Vcs-Git: http://git-wip-us.apache.org/repos/asf/cassandra.git +Vcs-Browser: https://git-wip-us.apache.org/repos/asf?p=cassandra.git Standards-Version: 3.8.3 Package: cassandra Architecture: all -Depends: openjdk-6-jre-headless (>= 6b11) | java6-runtime, jsvc (>= 1.0), libcommons-daemon-java (>= 1.0), adduser, libjna-java, python (>= 2.5), python-support (>= 0.90.0), ${misc:Depends} +Depends: openjdk-7-jre-headless | java7-runtime, jsvc (>= 1.0), libcommons-daemon-java (>= 1.0), adduser, libjna-java, python (>= 2.5), python-support (>= 0.90.0), ${misc:Depends} Recommends: ntp Conflicts: apache-cassandra1 Replaces: apache-cassandra1