You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by ja...@apache.org on 2014/09/18 17:47:48 UTC
git commit: include CASSANDRA-7941 to fix packaging issue with 2.1.0
deb
Repository: cassandra
Updated Branches:
refs/heads/cassandra-2.1.0-debfix [created] e06c1e838
include CASSANDRA-7941 to fix packaging issue with 2.1.0 deb
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e06c1e83
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e06c1e83
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e06c1e83
Branch: refs/heads/cassandra-2.1.0-debfix
Commit: e06c1e8381525363e90ccf694275361e2958647a
Parents: c6a2c65
Author: Jake Luciani <ja...@apache.org>
Authored: Thu Sep 18 11:45:20 2014 -0400
Committer: Jake Luciani <ja...@apache.org>
Committed: Thu Sep 18 11:45:20 2014 -0400
----------------------------------------------------------------------
debian/changelog | 6 ++++++
debian/patched/001cassandra_yaml_dirs.dpatch | 3 +++
debian/patched/002cassandra_logdir_fix.dpatch | 1 +
debian/patches/001cassandra_yaml_dirs.dpatch | 0
debian/patches/002cassandra_logdir_fix.dpatch | 19 +++++++++++++++++++
debian/patches/00list | 1 +
debian/rules | 2 +-
7 files changed, 31 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/changelog
----------------------------------------------------------------------
diff --git a/debian/changelog b/debian/changelog
index f2ecceb..8bca662 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cassandra (2.1.0-2) unstable; urgency=medium
+
+ * Package fixes
+
+ -- Jake Luciani <ja...@ubuntuosx> Tue, 16 Sep 2014 10:47:24 -0400
+
cassandra (2.1.0) unstable; urgency=medium
* New release
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/patched/001cassandra_yaml_dirs.dpatch
----------------------------------------------------------------------
diff --git a/debian/patched/001cassandra_yaml_dirs.dpatch b/debian/patched/001cassandra_yaml_dirs.dpatch
new file mode 100644
index 0000000..4d5134a
--- /dev/null
+++ b/debian/patched/001cassandra_yaml_dirs.dpatch
@@ -0,0 +1,3 @@
+patching file conf/cassandra.yaml
+Hunk #1 succeeded at 95 (offset 1 line).
+Hunk #2 succeeded at 212 (offset 9 lines).
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/patched/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patched/002cassandra_logdir_fix.dpatch b/debian/patched/002cassandra_logdir_fix.dpatch
new file mode 100644
index 0000000..6f6f4fc
--- /dev/null
+++ b/debian/patched/002cassandra_logdir_fix.dpatch
@@ -0,0 +1 @@
+patching file bin/cassandra
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/patches/001cassandra_yaml_dirs.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/001cassandra_yaml_dirs.dpatch b/debian/patches/001cassandra_yaml_dirs.dpatch
old mode 100644
new mode 100755
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/patches/002cassandra_logdir_fix.dpatch
----------------------------------------------------------------------
diff --git a/debian/patches/002cassandra_logdir_fix.dpatch b/debian/patches/002cassandra_logdir_fix.dpatch
new file mode 100755
index 0000000..8836eb4
--- /dev/null
+++ b/debian/patches/002cassandra_logdir_fix.dpatch
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cassandra_logdir_fix.dpatch by Michael Shuler <mi...@pbandjelly.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+@DPATCH@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' cassandra~/bin/cassandra cassandra/bin/cassandra
+--- cassandra~/bin/cassandra 2014-09-15 19:42:28.000000000 -0500
++++ cassandra/bin/cassandra 2014-09-15 21:15:15.627505503 -0500
+@@ -134,7 +134,7 @@
+ props="$3"
+ class="$4"
+ cassandra_parms="-Dlogback.configurationFile=logback.xml"
+- cassandra_parms="$cassandra_parms -Dcassandra.logdir=$CASSANDRA_HOME/logs"
++ cassandra_parms="$cassandra_parms -Dcassandra.logdir=/var/log/cassandra"
+ cassandra_parms="$cassandra_parms -Dcassandra.storagedir=$cassandra_storagedir"
+
+ if [ "x$pidpath" != "x" ]; then
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/patches/00list
----------------------------------------------------------------------
diff --git a/debian/patches/00list b/debian/patches/00list
index 508c180..59b0d8b 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1 +1,2 @@
001cassandra_yaml_dirs.dpatch
+002cassandra_logdir_fix.dpatch
http://git-wip-us.apache.org/repos/asf/cassandra/blob/e06c1e83/debian/rules
----------------------------------------------------------------------
diff --git a/debian/rules b/debian/rules
index ca303f1..31fd0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
include /usr/share/dpatch/dpatch.make
ANT = /usr/bin/ant
-VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')
+VERSION = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \([^-]*\).*/\1/p')
test:
dh_testdir