Author: eevans
Date: Tue May 25 16:55:43 2010
New Revision: 948100
URL: http://svn.apache.org/viewvc?rev=948100&view=rev
Log:
update debian packaging to trunk
Patch by Peter Schüller; reviewed by eevans
Modified:
cassandra/trunk/debian/cassandra.install
cassandra/trunk/debian/init
cassandra/trunk/debian/rules
Modified: cassandra/trunk/debian/cassandra.install
URL:
http://svn.apache.org/viewvc/cassandra/trunk/debian/cassandra.install?rev=948100&r1=948099&r2=948100&view=diff
==============================================================================
--- cassandra/trunk/debian/cassandra.install (original)
+++ cassandra/trunk/debian/cassandra.install Tue May 25 16:55:43 2010
@@ -1,5 +1,5 @@
-conf/log4j.properties etc/cassandra
-conf/storage-conf.xml etc/cassandra
+conf/log4j-server.properties etc/cassandra
+conf/cassandra.yaml etc/cassandra
debian/cassandra.in.sh usr/share/cassandra
bin/cassandra usr/sbin
bin/cassandra-cli usr/bin
Modified: cassandra/trunk/debian/init
URL:
http://svn.apache.org/viewvc/cassandra/trunk/debian/init?rev=948100&r1=948099&r2=948100&view=diff
==============================================================================
--- cassandra/trunk/debian/init (original)
+++ cassandra/trunk/debian/init Tue May 25 16:55:43 2010
@@ -23,7 +23,7 @@ JVM_MAX_MEM="1G"
JVM_START_MEM="128M"
[ -e /usr/share/cassandra/apache-cassandra.jar ] || exit 0
-[ -e /etc/cassandra/storage-conf.xml ] || exit 0
+[ -e /etc/cassandra/cassandra.yaml ] || exit 0
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
@@ -45,7 +45,7 @@ classpath()
[ "x$cp" = "x" ] && cp=$j || cp=$cp:$j
done
- # Include the conf directory for purposes of log4j.properties, and
+ # Include the conf directory for purposes of log4j-server.properties, and
# commons-daemon in support of the daemonization class.
printf "$cp:$CONFDIR:/usr/share/java/commons-daemon.jar"
}
Modified: cassandra/trunk/debian/rules
URL:
http://svn.apache.org/viewvc/cassandra/trunk/debian/rules?rev=948100&r1=948099&r2=948100&view=diff
==============================================================================
--- cassandra/trunk/debian/rules (original)
+++ cassandra/trunk/debian/rules Tue May 25 16:55:43 2010
@@ -47,7 +47,7 @@ binary-indep: build install
dh_testroot
dh_installchangelogs
dh_installinit
- dh_installdocs README.txt DISCLAIMER.txt CHANGES.txt NEWS.txt
+ dh_installdocs README.txt CHANGES.txt NEWS.txt
dh_compress
dh_fixperms
dh_installdeb
