[sikuli] 01/02: Fix #750297 and #752738

Gilles Filippini pini at moszumanska.debian.org
Sun Jun 29 19:14:49 UTC 2014 

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 c1bbe9f41f7aefe3f9e54bc783ab9152961e8e65
Author: Gilles Filippini <pini at debian.org>
Date:   Sun Jun 29 19:23:54 2014 +0200

    Fix #750297 and #752738
---
 debian/changelog                               | 9 +++++++++
 debian/patches/executable-wrappers.patch       | 4 ++--
 debian/patches/setTextAndMnemonic.patch        | 4 ++--
 debian/patches/use-java-libs-from-debian.patch | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9af4c64..8017c21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-8) UNRELEASED; urgency=medium
+
+  * Update patch use-java-libs-from-debian.patch to use the new jar name
+    for libjson-simple-java (closes: #750297)
+  * Fix patch executable-wrappers.patch to add missing jars to the
+    classpath (closes: #752738)
+
+ -- Gilles Filippini <pini at debian.org>  Sun, 29 Jun 2014 17:35:52 +0200
+
 sikuli (1.0~x~rc3.tesseract3-dfsg1-7) unstable; urgency=low
 
   * Revert fix for java.lang.UnsatisfiedLinkError which was arch dependent
diff --git a/debian/patches/executable-wrappers.patch b/debian/patches/executable-wrappers.patch
index 394ef1e..2e2cacc 100644
--- a/debian/patches/executable-wrappers.patch
+++ b/debian/patches/executable-wrappers.patch
@@ -15,7 +15,7 @@ Index: sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
  #!/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 $*
-+LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/junit.jar:/usr/share/sikuli/sikuli-id [...]
++LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json-simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/us [...]
 Index: sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh
 ===================================================================
 --- sikuli-1.0~x~rc3.orig/sikuli-script/target/sikuli-script.sh	2013-07-13 17:45:14.000000000 +0200
@@ -23,4 +23,4 @@ Index: sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh
 @@ -1,2 +1,2 @@
  #!/bin/sh
 -java -jar sikuli-script.jar $@
-+exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/sikuli-script.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.script.SikuliScript "$@"
++exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/sikuli-script.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.script.SikuliScript "$@"
diff --git a/debian/patches/setTextAndMnemonic.patch b/debian/patches/setTextAndMnemonic.patch
index a59f56c..728a319 100644
--- a/debian/patches/setTextAndMnemonic.patch
+++ b/debian/patches/setTextAndMnemonic.patch
@@ -60,5 +60,5 @@ Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
 +++ sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2013-06-07 08:03:30.000000000 +0200
 @@ -1,2 +1,2 @@
  #!/bin/sh
--LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/junit.jar:/usr/share/sikuli/sikuli-id [...]
-+LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/jgoodies-common.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/j [...]
+-LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json-simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/us [...]
++LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json-simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/us [...]
diff --git a/debian/patches/use-java-libs-from-debian.patch b/debian/patches/use-java-libs-from-debian.patch
index 2b1a94e..718b80d 100644
--- a/debian/patches/use-java-libs-from-debian.patch
+++ b/debian/patches/use-java-libs-from-debian.patch
@@ -21,7 +21,7 @@ Index: sikuli/sikuli-ide/CMakeLists.txt
 +SET(JUNIT_JAR "/usr/share/java/junit.jar")
 +SET(SWING_LAYOUT_JAR "/usr/share/java/swing-layout.jar")
 +SET(COMMONS_CLI_JAR "/usr/share/java/commons-cli.jar")
-+SET(JSON_SIMPLE_JAR "/usr/share/java/json_simple.jar")
++SET(JSON_SIMPLE_JAR "/usr/share/java/json-simple.jar")
 +SET(SWINGX_JAR "/usr/share/java/swingx-core.jar")
 +SET(MAC_WIDGETS_JAR "/usr/share/java/mac_widgets.jar")
 +SET(FORMS_JAR "/usr/share/java/forms.jar")

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

More information about the pkg-java-commits mailing list