diff --git a/debian/control b/debian/control index 8a30de1e7c..cc5928ccd1 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: misc Priority: extra Maintainer: Eric Evans Uploaders: Sylvain Lebresne -Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional (>= 1.7), python-support, dpatch, bash-completion +Build-Depends: debhelper (>= 5), openjdk-7-jdk | java7-jdk, ant (>= 1.7), ant-optional (>= 1.7), dh-python, python-dev (>= 2.7), dpatch, bash-completion Homepage: http://cassandra.apache.org 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 @@ -11,7 +11,7 @@ Standards-Version: 3.8.3 Package: cassandra Architecture: all -Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), python-support (>= 0.90.0), ${misc:Depends} +Depends: openjdk-7-jre-headless | java7-runtime, adduser, python (>= 2.7), ${misc:Depends} Recommends: ntp | time-daemon Suggests: cassandra-tools Conflicts: apache-cassandra1 diff --git a/src/java/org/apache/cassandra/utils/Interval.java b/src/java/org/apache/cassandra/utils/Interval.java index 335ef27f3a..b96a3d7a1d 100644 --- a/src/java/org/apache/cassandra/utils/Interval.java +++ b/src/java/org/apache/cassandra/utils/Interval.java @@ -39,7 +39,7 @@ public class Interval return create(min, max, null); } - public static Interval create(C min, C max, D data) + public static Interval git gitcreate(C min, C max, D data) { return new Interval(min, max, data); }