[sikuli] 01/01: Fix patch executable-wrappers.patch and depends libjnr-constants-java

[Gilles Filippini]

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

pini pushed a commit to branch 1.0_x_rc3
in repository sikuli.

commit 46ef010fa3348469d719a501efdc494982d649b5
Author: Gilles Filippini <pini at debian.org>
Date:   Sat May 23 15:37:13 2015 +0200

    Fix patch executable-wrappers.patch and depends libjnr-constants-java
---
 debian/changelog                         | 9 +++++++++
 debian/control                           | 3 ++-
 debian/patches/executable-wrappers.patch | 7 +++++--
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5c8dc72..481bc7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-10) unstable; urgency=medium
+
+  * Fix executable-wrappers.patch:
+    + add missing backslash
+    + add libjnr-ffi.jar to classpath
+  * libsikuli-script-java: Depends: libjnr-constants-java
+
+ -- Gilles Filippini <pini at debian.org>  Sat, 23 May 2015 15:37:04 +0200
+
 sikuli (1.0~x~rc3.tesseract3-dfsg1-9) unstable; urgency=medium
 
   * Fix executable-wrappers.patch (thanks to Chad Miller):
diff --git a/debian/control b/debian/control
index e989314..3adf2ec 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,8 @@ Description: IDE to develop sikuli scripts and use them as junit test cases
 
 Package: libsikuli-script-java
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, default-jre (>= 1:1.6) | java6-runtime, libsikuli-script-jni, jython, wmctrl, xdotool, tesseract-ocr-eng
+Depends: ${java:Depends}, ${misc:Depends}, default-jre (>= 1:1.6) | java6-runtime, libsikuli-script-jni, jython, wmctrl, xdotool, tesseract-ocr-eng,
+ libjnr-constants-java
 Suggests: libsikuli-script-doc
 Description: Visual scripting API for jython
  Sikuli mixes image recognition into Jython scripting to automate
diff --git a/debian/patches/executable-wrappers.patch b/debian/patches/executable-wrappers.patch
index 62d30b5..12877b2 100644
--- a/debian/patches/executable-wrappers.patch
+++ b/debian/patches/executable-wrappers.patch
@@ -8,7 +8,7 @@ Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
 ===================================================================
 --- sikuli.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
 +++ sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
-@@ -1,3 +1,30 @@
+@@ -1,3 +1,31 @@
  #!/bin/sh
 -DIR=`dirname $0`
 -LC_NUMERIC=C java -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -jar $DIR/sikuli-ide.jar $*
@@ -22,6 +22,7 @@ Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
 +/usr/share/java/asm3-commons.jar:\
 +/usr/share/java/antlr3-runtime.jar:\
 +/usr/share/java/jnr-constants.jar:\
++/usr/share/java/jnr-ffi.jar:\
 +/usr/share/java/jython.jar:\
 +/usr/share/java/commons-cli.jar:\
 +/usr/share/java/JXGrabKey.jar:\
@@ -48,7 +49,7 @@ Index: sikuli/sikuli-script/target/sikuli-script.sh
 @@ -1,2 +1,17 @@
  #!/bin/sh
 -java -jar sikuli-script.jar $@
-+exec /usr/bin/java 
++exec /usr/bin/java \
 +	-cp \
 +/usr/share/java/guava.jar:\
 +/usr/share/java/jnr-posix.jar:\
@@ -57,6 +58,8 @@ Index: sikuli/sikuli-script/target/sikuli-script.sh
 +/usr/share/java/asm3.jar:\
 +/usr/share/java/asm3-commons.jar:\
 +/usr/share/java/antlr3-runtime.jar:\
++/usr/share/java/jnr-constants.jar:\
++/usr/share/java/jnr-ffi.jar:\
 +/usr/share/java/jython.jar:\
 +/usr/share/java/sikuli-script.jar \
 +	-Dfile.encoding=UTF-8 \

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