Author: eevans
Date: Wed Dec 21 22:19:37 2011
New Revision: 1221909
URL: http://svn.apache.org/viewvc?rev=1221909&view=rev
Log:
add cqlsh to debian packaging
Patch by paul cannon (w/ minor changes); reviewed by eevans for CASSANDRA-3458
Added:
cassandra/branches/cassandra-1.0/debian/pyversions
cassandra/branches/cassandra-1.0/pylib/setup.py
Modified:
cassandra/branches/cassandra-1.0/debian/cassandra.install
cassandra/branches/cassandra-1.0/debian/control
cassandra/branches/cassandra-1.0/debian/rules
Modified: cassandra/branches/cassandra-1.0/debian/cassandra.install
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/debian/cassandra.install?rev=1221909&r1=1221908&r2=1221909&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/debian/cassandra.install (original)
+++ cassandra/branches/cassandra-1.0/debian/cassandra.install Wed Dec 21
22:19:37 2011
@@ -11,5 +11,6 @@ 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
Modified: cassandra/branches/cassandra-1.0/debian/control
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/debian/control?rev=1221909&r1=1221908&r2=1221909&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/debian/control (original)
+++ cassandra/branches/cassandra-1.0/debian/control Wed Dec 21 22:19:37 2011
@@ -2,7 +2,8 @@ Source: cassandra
Section: misc
Priority: extra
Maintainer: Eric Evans <[email protected]>
-Build-Depends: debhelper (>= 5), openjdk-6-jdk (>= 6b11) | java6-sdk, ant (>=
1.7), ant-optional (>= 1.7), subversion
+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)
Homepage: http://cassandra.apache.org
Vcs-Svn: https://svn.apache.org/repos/asf/cassandra/trunk
Vcs-Browser: http://svn.apache.org/viewvc/cassandra/trunk
@@ -10,7 +11,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
+Depends: openjdk-6-jre-headless (>= 6b11) | java6-runtime, jsvc (>= 1.0),
libcommons-daemon-java (>= 1.0), adduser, libjna-java, python-cql,
${python:Depends}, ${misc:Depends}
Conflicts: apache-cassandra1
Replaces: apache-cassandra1
Description: distributed storage system for structured data
Added: cassandra/branches/cassandra-1.0/debian/pyversions
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/debian/pyversions?rev=1221909&view=auto
==============================================================================
--- cassandra/branches/cassandra-1.0/debian/pyversions (added)
+++ cassandra/branches/cassandra-1.0/debian/pyversions Wed Dec 21 22:19:37 2011
@@ -0,0 +1 @@
+2.5-
Modified: cassandra/branches/cassandra-1.0/debian/rules
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/debian/rules?rev=1221909&r1=1221908&r2=1221909&view=diff
==============================================================================
--- cassandra/branches/cassandra-1.0/debian/rules (original)
+++ cassandra/branches/cassandra-1.0/debian/rules Wed Dec 21 22:19:37 2011
@@ -18,6 +18,7 @@ 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
@@ -26,6 +27,8 @@ 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
@@ -34,6 +37,7 @@ 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 \
Added: cassandra/branches/cassandra-1.0/pylib/setup.py
URL:
http://svn.apache.org/viewvc/cassandra/branches/cassandra-1.0/pylib/setup.py?rev=1221909&view=auto
==============================================================================
--- cassandra/branches/cassandra-1.0/pylib/setup.py (added)
+++ cassandra/branches/cassandra-1.0/pylib/setup.py Wed Dec 21 22:19:37 2011
@@ -0,0 +1,24 @@
+#!/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"],
+)
