[svnkit] 11/21: Rebase script-fix-classpath.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository svnkit.

commit 13459764b9e449cae13d17e39f9c4dbda531db9f
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 9 00:00:33 2016 +0200

    Rebase script-fix-classpath.patch
---
 debian/patches/fix-logging-path.patch     |  5 +----
 debian/patches/script-fix-classpath.patch | 35 +++++++++++++++++++++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/debian/patches/fix-logging-path.patch b/debian/patches/fix-logging-path.patch
index 4054727..80db1c5 100644
--- a/debian/patches/fix-logging-path.patch
+++ b/debian/patches/fix-logging-path.patch
@@ -7,7 +7,7 @@ Subject: fix-logging-path
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/svnkit-cli/src/main/conf/logging.properties b/svnkit-cli/src/main/conf/logging.properties
-index 1485c6e..44fbeb5 100644
+index 1485c6e..4a9388c 100644
 --- a/svnkit-cli/src/main/conf/logging.properties
 +++ b/svnkit-cli/src/main/conf/logging.properties
 @@ -8,8 +8,8 @@ svnkit-wc.level=FINEST
@@ -22,6 +22,3 @@ index 1485c6e..44fbeb5 100644
 -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 \ No newline at end of file
 +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
--- 
-1.9.0
-
diff --git a/debian/patches/script-fix-classpath.patch b/debian/patches/script-fix-classpath.patch
new file mode 100644
index 0000000..96efe1d
--- /dev/null
+++ b/debian/patches/script-fix-classpath.patch
@@ -0,0 +1,35 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 9 Oct 2016 00:00:07 +0200
+Subject: script fix classpath
+
+---
+ svnkit-cli/src/main/scripts/jsvn | 11 ++++-------
+ 1 file changed, 4 insertions(+), 7 deletions(-)
+
+diff --git a/svnkit-cli/src/main/scripts/jsvn b/svnkit-cli/src/main/scripts/jsvn
+index 56dbe40..e74dc4c 100644
+--- a/svnkit-cli/src/main/scripts/jsvn
++++ b/svnkit-cli/src/main/scripts/jsvn
+@@ -1,3 +1,5 @@
++#!/bin/sh
++
+ BASEDIR="`dirname "\$0"`/.."
+ BASEDIR=`(cd "\$BASEDIR"; pwd)`
+ 
+@@ -49,14 +51,9 @@ if [ ! -x "\$JAVACMD" ] ; then
+   exit 1
+ fi
+ 
+-if [ -z "\$SVNKIT_LIB" ]
+-then
+-  SVNKIT_LIB="\$BASEDIR"/lib
+-fi
+-
+-<% project[classpath_property].eachWithIndex { elem, index -> %>CLASSPATH=<% if (index != 0) { %>\$CLASSPATH:<% } %>"\$SVNKIT_LIB/${elem}"
++<% project[classpath_property].eachWithIndex { elem, index -> %>CLASSPATH="/usr/share/svnkit/svnkit-cli.jar"
+ <% } %>
+-LOGGING_PROPERTIES_PATH="\$BASEDIR/conf/logging.properties"
++LOGGING_PROPERTIES_PATH="/etc/svnkit/logging.properties"
+ 
+ # For Cygwin, switch paths to Windows format before running java
+ if \$cygwin; then
diff --git a/debian/patches/series b/debian/patches/series
index 666c19f..e04c02b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-logging-path.patch
+script-fix-classpath.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/svnkit.git