Revert #3458 until #3507 is settled
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9f320143 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9f320143 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9f320143 Branch: refs/heads/cassandra-1.0 Commit: 9f320143dadee7640209041c08cd49d40709c504 Parents: 52e671a Author: Sylvain Lebresne <[email protected]> Authored: Wed Jan 4 17:42:36 2012 +0100 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Jan 4 17:42:36 2012 +0100 ---------------------------------------------------------------------- debian/cassandra.install | 1 - debian/control | 5 ++--- debian/pyversions | 1 - debian/rules | 4 ---- pylib/setup.py | 24 ------------------------ 5 files changed, 2 insertions(+), 33 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f320143/debian/cassandra.install ---------------------------------------------------------------------- diff --git a/debian/cassandra.install b/debian/cassandra.install index ecefe47..214b5db 100644 --- a/debian/cassandra.install +++ b/debian/cassandra.install @@ -11,6 +11,5 @@ bin/json2sstable usr/bin bin/sstable2json usr/bin bin/sstablekeys usr/bin bin/sstableloader usr/bin -bin/cqlsh usr/bin lib/*.jar usr/share/cassandra/lib lib/licenses usr/share/doc/cassandra http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f320143/debian/control ---------------------------------------------------------------------- diff --git a/debian/control b/debian/control index 1529582..56b76ed 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,7 @@ Source: cassandra Section: misc Priority: extra Maintainer: Eric Evans <[email protected]> -Uploaders: Sylvain Lebresne <[email protected]> -Build-Depends: debhelper (>= 5), openjdk-6-jdk (>= 6b11) | java6-sdk, ant (>= 1.7), ant-optional (>= 1.7), subversion, python-support (>= 0.6) +Build-Depends: debhelper (>= 5), openjdk-6-jdk (>= 6b11) | java6-sdk, ant (>= 1.7), ant-optional (>= 1.7), subversion Homepage: http://cassandra.apache.org Vcs-Svn: https://svn.apache.org/repos/asf/cassandra/trunk Vcs-Browser: http://svn.apache.org/viewvc/cassandra/trunk @@ -11,7 +10,7 @@ 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-cql, python (>= 2.5), python-support (>= 0.90.0), ${misc:Depends} +Depends: openjdk-6-jre-headless (>= 6b11) | java6-runtime, jsvc (>= 1.0), libcommons-daemon-java (>= 1.0), adduser, libjna-java Conflicts: apache-cassandra1 Replaces: apache-cassandra1 Description: distributed storage system for structured data http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f320143/debian/pyversions ---------------------------------------------------------------------- diff --git a/debian/pyversions b/debian/pyversions deleted file mode 100644 index b3dc41e..0000000 --- a/debian/pyversions +++ /dev/null @@ -1 +0,0 @@ -2.5- http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f320143/debian/rules ---------------------------------------------------------------------- diff --git a/debian/rules b/debian/rules index 97e0274..8906701 100755 --- a/debian/rules +++ b/debian/rules @@ -18,7 +18,6 @@ clean: rm -rf bin/java find -name "*.pyc" -exec rm '{}' ';' find -name "*py.class" -exec rm '{}' ';' - $(RM) -r pylib/build dh_clean build: build-stamp @@ -27,8 +26,6 @@ build-stamp: printf "version=%s" $(VERSION) > build.properties $(ANT) jar - cd pylib && python setup.py install --no-compile --install-layout deb \ - --root $(CURDIR)/debian/cassandra touch build-stamp @@ -37,7 +34,6 @@ install: build dh_testroot dh_installdirs dh_install - dh_pysupport # Copy in the jar and symlink to something stable dh_install build/apache-cassandra-$(VERSION).jar \ http://git-wip-us.apache.org/repos/asf/cassandra/blob/9f320143/pylib/setup.py ---------------------------------------------------------------------- diff --git a/pylib/setup.py b/pylib/setup.py deleted file mode 100644 index 704d077..0000000 --- a/pylib/setup.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/python -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -from distutils.core import setup - -setup( - name="cassandra-pylib", - description="Cassandra Python Libraries", - packages=["cqlshlib"], -)
