Merge lp:~cmiller/ubuntu/utopic/sikuli/lp1313398 into lp:ubuntu/utopic/sikuli

[Chad Miller]

sikuli programs "sikuli-ide" and "sikuli" don't work in U. They lack at least three required classes in their class-paths. (LP: #1313398)

This patch splits an enormous execution line in the wrapper scripts over several lines, to make it patchable, instead of noise.

Then, it adds the three required jarfiles to class paths defined in the wrapper scripts.

Finally, it cleans up patches, using quilt flags, refreshing each
  quilt refresh -p ab --no-timestamps --no-index --sort

[lp:~cmiller/ubuntu/utopic/sikuli/lp1313398]

18. By Chad Miller on 2014-09-05

Fix broken patches that add classpaths.

Make all patches nicer.

[Sebastien Bacher (seb128)]

Thanks Chad, sorry for the delay in review. It looks like Debian fixed the issue so we could merge their current version. Could you maybe send your changes to the Debian BTS? They seem useful, but we shouldn't have a diff over Debian for that, it could go there and be useful for Debian and Ubuntu as well

review: Needs Information

[Sebastien Bacher (seb128)]

setting to rejected, I'm synced sikuli from Debian to get the fix, the improvements from this merge request should go to the BTS, thanks!

Unmerged revisions

18. By Chad Miller on 2014-09-05

Fix broken patches that add classpaths.

Make all patches nicer.

17. By Chad Miller on 2014-09-04

Split previous commit into a separate patch. debian/patches/missing-class-paths.patch

16. By Chad Miller on 2014-09-04

debian/patches/executable-wrappers.patch,
debian/patches/setTextAndMnemonic.patch: Make astonishingly unpatchable
exec wrapper patchable. Add jar files to class path
 /usr/share/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar
 /usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar
 /usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar
and add -Djruby.native.enabled=false definition to use POSIX code path in
jruby/jaffl. (LP: #1313398)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2013-07-24 13:10:29 +0000
+++ .pc/applied-patches	2014-09-05 14:54:04 +0000
@@ -1,4 +1,5 @@
 executable-wrappers.patch
+missing-class-paths.patch
 native.patch
 use-java-libs-from-debian.patch
 install-extension.patch

=== modified file '.pc/setTextAndMnemonic.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh'
--- .pc/setTextAndMnemonic.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2013-07-13 18:44:41 +0000
+++ .pc/setTextAndMnemonic.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2014-09-05 14:54:04 +0000
@@ -1,2 +1,30 @@
 #!/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-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
+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/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar:\
+/usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar:\
+/usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar:\
+/usr/share/sikuli/sikuli-ide.jar:\
+/usr/share/java/sikuli-script.jar" \
+	-Dsikuli.console=true \
+	-Dsikuli.debug=0 \
+	-Xms64M -Xmx512M \
+	-Dfile.encoding=UTF-8 \
+	-Dpython.home=/usr/share/jython \
+	-Dpython.path="/usr/share/sikuli/Lib" \
+	-Dpython.cachedir=$HOME/.jython-cache \
+	org.sikuli.ide.SikuliIDE "$@"

=== modified file 'debian/changelog'
--- debian/changelog	2013-07-24 13:10:29 +0000
+++ debian/changelog	2014-09-05 14:54:04 +0000
@@ -1,3 +1,16 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-7ubuntu2) UNRELEASED; urgency=low
+
+  * debian/patches/executable-wrappers.patch,
+    debian/patches/setTextAndMnemonic.patch: Make astonishingly unpatchable
+    exec wrapper patchable.
+  * debian/patches/missing-class-paths.patch: Add jar files to class path
+      /usr/share/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar
+      /usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar
+      /usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar
+    (LP: #1313398)
+
+ -- Chad MILLER <[e-mail]>  Thu, 04 Sep 2014 12:12:10 -0400
+
 sikuli (1.0~x~rc3.tesseract3-dfsg1-7ubuntu1) saucy; urgency=low
 
   * Merge from Debian unstable.

=== modified file 'debian/patches/executable-wrappers.patch'
--- debian/patches/executable-wrappers.patch	2013-07-13 18:44:41 +0000
+++ debian/patches/executable-wrappers.patch	2014-09-05 14:54:04 +0000
@@ -7,20 +7,54 @@
   ImportError: cannot import name newString
  when it is missing.
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
-===================================================================
---- sikuli-1.0~x~rc3.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2013-07-13 17:45:14.000000000 +0200
-+++ sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2013-07-13 17:45:33.000000000 +0200
-@@ -1,3 +1,2 @@
+--- a/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
++++ b/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+@@ -1,3 +1,27 @@
  #!/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-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
-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
-+++ sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh	2013-07-13 17:45:14.000000000 +0200
-@@ -1,2 +1,2 @@
++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-ide.jar:\
++/usr/share/java/sikuli-script.jar" \
++	-Dsikuli.console=true \
++	-Dsikuli.debug=0 \
++	-Xms64M -Xmx512M \
++	-Dfile.encoding=UTF-8 \
++	-Dpython.home=/usr/share/jython \
++	-Dpython.path="/usr/share/sikuli/Lib" \
++	-Dpython.cachedir=$HOME/.jython-cache \
++	org.sikuli.ide.SikuliIDE "$@"
+--- a/sikuli-script/target/sikuli-script.sh
++++ b/sikuli-script/target/sikuli-script.sh
+@@ -1,2 +1,15 @@
  #!/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/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 "$@"

=== modified file 'debian/patches/fix-cmake-sikuli-ide.patch'
--- debian/patches/fix-cmake-sikuli-ide.patch	2012-02-15 15:17:58 +0000
+++ debian/patches/fix-cmake-sikuli-ide.patch	2014-09-05 14:54:04 +0000
@@ -1,10 +1,8 @@
 Description: Fix build-time dependencies for sikuli-ide
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli/sikuli-ide/CMakeLists.txt
-===================================================================
---- sikuli.orig/sikuli-ide/CMakeLists.txt	2011-10-04 23:27:53.000000000 +0200
-+++ sikuli/sikuli-ide/CMakeLists.txt	2011-10-04 23:32:05.000000000 +0200
-@@ -307,6 +307,8 @@
+--- a/sikuli-ide/CMakeLists.txt
++++ b/sikuli-ide/CMakeLists.txt
+@@ -307,6 +307,8 @@ FOREACH(JAR ${INCLUDE_JARS})
  ENDFOREACH(JAR ${INCLUDE_JARS})
  
  

=== modified file 'debian/patches/force-java6-target.patch'
--- debian/patches/force-java6-target.patch	2013-07-24 13:10:29 +0000
+++ debian/patches/force-java6-target.patch	2014-09-05 14:54:04 +0000
@@ -2,11 +2,9 @@
  This patch forces Java 6 when building targets. If not, it builds for 
  Java 7 by default.
 Author: Yolanda Robla <[e-mail]>
-Index: sikuli-1.0~x~rc3/sikuli-ide/src/main/java/CMakeLists.txt
-===============================================================
---- sikuli/sikuli-ide/src/main/java/CMakeLists.txt      2013-06-21 15:37:19.488132999 +0000
-+++ sikuli.orig/sikuli-ide/src/main/java/CMakeLists.txt 2013-06-25 09:26:31.936132999 +0000
-@@ -68,7 +68,7 @@
+--- a/sikuli-ide/src/main/java/CMakeLists.txt
++++ b/sikuli-ide/src/main/java/CMakeLists.txt
+@@ -68,7 +68,7 @@ SET(JAVA_SOURCE_FILES
  
  add_custom_target( ${PROJECT_NAME}.classes
      COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}"
@@ -15,11 +13,9 @@
      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
       
  
-Index: sikuli-1.0~x~rc3/sikuli-script/src/main/java/CMakeLists.txt
-==================================================================
---- sikuli/sikuli-script/src/main/java/CMakeLists.txt	2013-06-25 11:20:48.357858000 +0000
-+++ sikuli/sikuli-script/src/main/java/CMakeLists.txt	2013-06-25 11:21:08.328132999 +0000
-@@ -70,7 +70,7 @@
+--- a/sikuli-script/src/main/java/CMakeLists.txt
++++ b/sikuli-script/src/main/java/CMakeLists.txt
+@@ -70,7 +70,7 @@ SET(JAVA_SOURCE_FILES
  
  add_custom_target( ${PROJECT_NAME}.classes
      COMMAND ${JAVA_COMPILE} -d ${BINARY_CLASS_DIR} -classpath "${CLASSPATH}"

=== modified file 'debian/patches/gcc-4.7.patch'
--- debian/patches/gcc-4.7.patch	2012-05-11 23:51:05 +0000
+++ debian/patches/gcc-4.7.patch	2014-09-05 14:54:04 +0000
@@ -1,11 +1,9 @@
 Description: Fix FTBFS with gcc-4.7
 Author: Gilles Filippini <[e-mail]>
 Bug-Debian: http://bugs.debian.org/671990
-Index: sikuli/sikuli-script/src/main/native/sikuli-debug.h
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/sikuli-debug.h	2011-11-10 23:53:01.000000000 +0100
-+++ sikuli/sikuli-script/src/main/native/sikuli-debug.h	2012-05-11 23:34:39.000000000 +0200
-@@ -34,7 +34,7 @@
+--- a/sikuli-script/src/main/native/sikuli-debug.h
++++ b/sikuli-script/src/main/native/sikuli-debug.h
+@@ -34,7 +34,7 @@ namespace sikuli{
             std::basic_ios<cT, traits>(&m_sbuf), 
             std::basic_ostream<cT, traits>(&m_sbuf) 
          { 

=== modified file 'debian/patches/install-extension.patch'
--- debian/patches/install-extension.patch	2011-10-04 00:57:09 +0000
+++ debian/patches/install-extension.patch	2014-09-05 14:54:04 +0000
@@ -1,10 +1,8 @@
 Description: Fix extensions installation in user space
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java
-===================================================================
---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java	2011-09-22 23:37:18.000000000 +0200
-+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java	2011-09-26 11:52:00.000000000 +0200
-@@ -132,13 +132,14 @@
+--- a/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java
++++ b/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java
+@@ -132,13 +132,14 @@ public class ExtensionManager {
           File targetFile = new File(extPath, extName);
           if(targetFile.exists())
              targetFile.delete();

=== added file 'debian/patches/missing-class-paths.patch'
--- debian/patches/missing-class-paths.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/missing-class-paths.patch	2014-09-05 14:54:04 +0000
@@ -0,0 +1,31 @@
+Description: Fix missing classes:
+ com.google.common.collect.MapMaker -> /usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar
+ org.jruby.ext.posix.POSIXHandler -> /usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar
+ com.kenai.jaffl.struct.Struct -> /usr/share/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar
+Author: Chad MILLER <[e-mail]>
+
+
+--- a/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
++++ b/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+@@ -15,6 +15,9 @@ LC_NUMERIC=C exec /usr/bin/java \
+ /usr/share/java/forms.jar:\
+ /usr/share/java/mac_widgets.jar:\
+ /usr/share/java/junit.jar:\
++/usr/share/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar:\
++/usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar:\
++/usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar:\
+ /usr/share/sikuli/sikuli-ide.jar:\
+ /usr/share/java/sikuli-script.jar" \
+ 	-Dsikuli.console=true \
+--- a/sikuli-script/target/sikuli-script.sh
++++ b/sikuli-script/target/sikuli-script.sh
+@@ -7,6 +7,9 @@ exec /usr/bin/java \
+ /usr/share/java/antlr3-runtime.jar:\
+ /usr/share/java/libconstantine-java.jar:\
+ /usr/share/java/jython.jar:\
++/usr/share/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar:\
++/usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar:\
++/usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar:\
+ /usr/share/java/sikuli-script.jar" \
+ 	-Dfile.encoding=UTF-8 \
+ 	-Dpython.home=/usr/share/jython \

=== modified file 'debian/patches/native.patch'
--- debian/patches/native.patch	2012-02-15 15:17:58 +0000
+++ debian/patches/native.patch	2014-09-05 14:54:04 +0000
@@ -6,36 +6,9 @@
  libraries are shipped in their own binary package and we use the standard
  native library loader.
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java
-===================================================================
---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java	2012-02-13 23:18:12.000000000 +0100
-+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java	2012-02-13 23:18:28.000000000 +0100
-@@ -12,7 +12,6 @@
- import java.util.HashMap;
- import java.util.Map;
- import java.util.List;
--import com.wapmx.nativeutils.jniloader.NativeLoader;
- 
- public class VDictProxy<T> {
-    private long _instance;
-@@ -22,10 +21,10 @@
-       // load libScreenMatchProxy.{so,jnilib}
-       //System.loadLibrary("ScreenMatchProxy");
-       try{
--         NativeLoader.loadLibrary("VDictProxy");
-+         System.loadLibrary("VDictProxy");
-          Debug.info("VDictProxy loaded.");
-       }
--      catch(IOException e){
-+      catch(Exception e){
-          e.printStackTrace();
-       }
-    }
-Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/Finder.java
-===================================================================
---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/Finder.java	2012-02-13 23:18:12.000000000 +0100
-+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/Finder.java	2012-02-13 23:18:28.000000000 +0100
-@@ -18,8 +18,6 @@
+--- a/sikuli-script/src/main/java/org/sikuli/script/Finder.java
++++ b/sikuli-script/src/main/java/org/sikuli/script/Finder.java
+@@ -18,8 +18,6 @@ import org.sikuli.script.natives.Mat;
  import org.sikuli.script.natives.TARGET_TYPE;
  import org.sikuli.script.natives.Vision;
  
@@ -44,7 +17,7 @@
  public class Finder implements Iterator<Match>{
     private Region _region = null;
     private Pattern _pattern = null;
-@@ -30,10 +28,10 @@
+@@ -30,10 +28,10 @@ public class Finder implements Iterator<
  
     static {
        try{
@@ -57,11 +30,9 @@
           e.printStackTrace();
        }
        //Vision.setParameter("GPU", 1);
-Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java
-===================================================================
---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java	2012-02-13 23:18:12.000000000 +0100
-+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java	2012-02-13 23:18:28.000000000 +0100
-@@ -17,18 +17,16 @@
+--- a/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java
++++ b/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java
+@@ -17,18 +17,16 @@ import org.sikuli.script.natives.Vision;
  import org.sikuli.script.natives.OCRWord;
  import org.sikuli.script.natives.OCRWords;
  
@@ -82,11 +53,32 @@
           e.printStackTrace();
        }
     }
-Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java
-===================================================================
---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java	2012-02-13 23:18:12.000000000 +0100
-+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java	2012-02-13 23:18:28.000000000 +0100
-@@ -15,16 +15,15 @@
+--- a/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java
++++ b/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java
+@@ -12,7 +12,6 @@ import java.util.Vector;
+ import java.util.HashMap;
+ import java.util.Map;
+ import java.util.List;
+-import com.wapmx.nativeutils.jniloader.NativeLoader;
+ 
+ public class VDictProxy<T> {
+    private long _instance;
+@@ -22,10 +21,10 @@ public class VDictProxy<T> {
+       // load libScreenMatchProxy.{so,jnilib}
+       //System.loadLibrary("ScreenMatchProxy");
+       try{
+-         NativeLoader.loadLibrary("VDictProxy");
++         System.loadLibrary("VDictProxy");
+          Debug.info("VDictProxy loaded.");
+       }
+-      catch(IOException e){
++      catch(Exception e){
+          e.printStackTrace();
+       }
+    }
+--- a/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java
++++ b/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java
+@@ -15,16 +15,15 @@ import org.sikuli.script.Debug;
  import org.sikuli.script.HotkeyListener;
  import org.sikuli.script.HotkeyEvent;
  
@@ -105,10 +97,8 @@
           Debug.error("Can't load native lib JXGrabKey");
           e.printStackTrace();
        }
-Index: sikuli/sikuli-script/src/main/native/vision.i
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/vision.i	2012-02-13 23:18:12.000000000 +0100
-+++ sikuli/sikuli-script/src/main/native/vision.i	2012-02-13 23:18:28.000000000 +0100
+--- a/sikuli-script/src/main/native/vision.i
++++ b/sikuli-script/src/main/native/vision.i
 @@ -13,14 +13,14 @@
  %include "typemaps.i"
  %include "various.i"

=== modified file 'debian/patches/no-opencv-surf-module.patch'
--- debian/patches/no-opencv-surf-module.patch	2012-06-25 12:33:23 +0000
+++ debian/patches/no-opencv-surf-module.patch	2014-09-05 14:54:04 +0000
@@ -4,11 +4,9 @@
  doesn't use the code depending on it.
  This patch removes the corresponding portions of code.
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli/sikuli-script/src/main/native/cvgui.cpp
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/cvgui.cpp	2012-06-21 13:28:17.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/cvgui.cpp	2012-06-24 22:06:30.000000000 +0200
-@@ -1548,324 +1548,6 @@
+--- a/sikuli-script/src/main/native/cvgui.cpp
++++ b/sikuli-script/src/main/native/cvgui.cpp
+@@ -1548,324 +1548,6 @@ cvgui::getLineBlobsAsIndividualWords(con
  //   VLOG("OCR-Result", ocr_result_image);
  }
  
@@ -333,11 +331,9 @@
  
  
  static int L1dist(Vec3b p1, Vec3b p2){
-Index: sikuli/sikuli-script/src/main/native/cvgui.h
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/cvgui.h	2012-06-21 13:28:17.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/cvgui.h	2012-06-24 22:06:30.000000000 +0200
-@@ -179,7 +179,6 @@
+--- a/sikuli-script/src/main/native/cvgui.h
++++ b/sikuli-script/src/main/native/cvgui.h
+@@ -179,7 +179,6 @@ class cvgui {
     
  public:
     
@@ -345,11 +341,9 @@
     static void getLineBlobsAsIndividualWords(const Mat& screen, vector<LineBlob>& lineblobs);
     static void getParagraphBlobs(const Mat& screen, vector<ParagraphBlob>& parablobs);
     
-Index: sikuli/sikuli-script/src/main/native/imgdb.cpp
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/imgdb.cpp	2012-06-21 13:28:17.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/imgdb.cpp	2012-06-24 22:09:07.000000000 +0200
-@@ -24,38 +24,6 @@
+--- a/sikuli-script/src/main/native/imgdb.cpp
++++ b/sikuli-script/src/main/native/imgdb.cpp
+@@ -24,38 +24,6 @@ Database::Database(){
  }
  
  
@@ -388,7 +382,7 @@
  void
  Database::insert(const ImageRecord& b){
     _image_records.push_back(b);
-@@ -111,89 +79,6 @@
+@@ -111,89 +79,6 @@ static int word_id = 0;
  
  #include <fstream>
  
@@ -478,11 +472,9 @@
  vector<ImageRecord>
  Database::create_image_records_from_blobs(const Mat& src, const vector<Blob> image_blobs){
     
-Index: sikuli/sikuli-script/src/main/native/imgdb.h
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/imgdb.h	2012-06-21 13:28:17.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/imgdb.h	2012-06-24 22:10:07.000000000 +0200
-@@ -56,9 +56,6 @@
+--- a/sikuli-script/src/main/native/imgdb.h
++++ b/sikuli-script/src/main/native/imgdb.h
+@@ -56,9 +56,6 @@ public:
     vector<ImageRecord> find(const char* filename);
     vector<ImageRecord> find(Mat image);   
     
@@ -492,7 +484,7 @@
     void write(std::ostream& output_stream);
     void read(std::istream& input_stream);   
     
-@@ -67,8 +64,6 @@
+@@ -67,8 +64,6 @@ private:
     vector<ImageRecord> _image_records;
     
     vector<ImageRecord> create_image_records_from_blobs(const Mat& src, const vector<Blob> image_blobs);
@@ -501,11 +493,9 @@
     
  };
  
-Index: sikuli/sikuli-script/src/main/native/vision.cpp
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/vision.cpp	2012-06-21 13:28:17.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/vision.cpp	2012-06-24 22:09:38.000000000 +0200
-@@ -409,75 +409,12 @@
+--- a/sikuli-script/src/main/native/vision.cpp
++++ b/sikuli-script/src/main/native/vision.cpp
+@@ -409,75 +409,12 @@ Vision::recognize(Mat image){
     return text.getString();
  }
  
@@ -581,11 +571,9 @@
  cv::Mat Vision::createMat(int _rows, int _cols, unsigned char* _data){
     Mat mat_ref = Mat(_rows, _cols, CV_8UC4, _data);
     Mat mat;
-Index: sikuli/sikuli-script/src/main/native/vision.h
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/vision.h	2012-06-21 13:28:17.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/vision.h	2012-06-24 22:10:23.000000000 +0200
-@@ -93,13 +93,8 @@
+--- a/sikuli-script/src/main/native/vision.h
++++ b/sikuli-script/src/main/native/vision.h
+@@ -93,13 +93,8 @@ public:
     static void initOCR(const char* ocrDataPath);
     
     
@@ -599,11 +587,9 @@
     static std::string recognize(cv::Mat image);
     static std::string recognizeWord(cv::Mat image);
  
-Index: sikuli/sikuli-script/src/main/native/vision.i
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/vision.i	2012-06-24 22:06:29.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/vision.i	2012-06-24 22:10:31.000000000 +0200
-@@ -213,14 +213,8 @@
+--- a/sikuli-script/src/main/native/vision.i
++++ b/sikuli-script/src/main/native/vision.i
+@@ -213,14 +213,8 @@ namespace sikuli {
        
        static void initOCR(const char* ocrDataPath);
        

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-07-24 13:10:29 +0000
+++ debian/patches/series	2014-09-05 14:54:04 +0000
@@ -1,4 +1,5 @@
 executable-wrappers.patch
+missing-class-paths.patch
 native.patch
 use-java-libs-from-debian.patch
 install-extension.patch

=== modified file 'debian/patches/setTextAndMnemonic.patch'
--- debian/patches/setTextAndMnemonic.patch	2013-07-13 18:44:41 +0000
+++ debian/patches/setTextAndMnemonic.patch	2014-09-05 14:54:04 +0000
@@ -2,11 +2,36 @@
  Replace the deprecated method with MnemonicUtils#configure.
 Author: Gilles Filippini <[e-mail]>
 Bug-Debian: http://bugs.debian.org/711310
-Index: sikuli/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java
-===================================================================
---- sikuli.orig/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java	2013-06-07 08:02:38.000000000 +0200
-+++ sikuli/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java	2013-06-07 08:02:38.000000000 +0200
-@@ -33,6 +33,7 @@
+--- a/sikuli-ide/CMakeLists.txt
++++ b/sikuli-ide/CMakeLists.txt
+@@ -48,6 +48,7 @@ SET(JSON_SIMPLE_JAR "/usr/share/java/jso
+ 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")
++SET(COMMON_JAR "/usr/share/java/jgoodies-common.jar")
+ 
+ 
+ FILE(MAKE_DIRECTORY ${BINARY_DIR})
+@@ -79,7 +80,7 @@ ENDIF()
+ SET(ARGS "")
+ 
+ SET(CLASSPATH 
+-   ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}/usr/share/java/jython.jar
++   ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}${COMMON_JAR}${SEP}/usr/share/java/jython.jar
+ )
+ 
+ SET(JAR_FILE sikuli-ide.jar)
+@@ -141,6 +142,7 @@ SET(INCLUDE_JARS ${SIKULI_SCRIPT_JAR} ${
+                  ${SWING_LAYOUT_JAR} ${COMMONS_CLI_JAR}
+                  ${BINARY_DIR}/${JAR_FILE} ${JSON_SIMPLE_JAR}
+                  ${SWINGX_JAR} ${MAC_WIDGETS_JAR} ${FORMS_JAR}
++		 ${COMMON_JAR}
+ )
+ 
+ ## Windows Package
+--- a/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java
++++ b/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java
+@@ -33,6 +33,7 @@ import javax.swing.border.EmptyBorder;
  import javax.swing.event.ChangeEvent;
  import javax.swing.event.ChangeListener;
  import com.jgoodies.forms.factories.DefaultComponentFactory;
@@ -14,7 +39,7 @@
  import org.jdesktop.layout.*;
  
  import org.sikuli.script.Debug;
-@@ -496,8 +497,8 @@
+@@ -496,8 +497,8 @@ public class PreferencesWin extends JFra
  
     private void initComponentsI18n() {
        // JFormDesigner - Component i18n initialization - DO NOT MODIFY  //GEN-BEGIN:initI18n
@@ -25,40 +50,13 @@
        _lblHotkey.setText(I18N._I("prefCaptureHotkey"));
        _lblDelay.setText(I18N._I("prefCaptureDelay"));
        _lblDelaySecs.setText(I18N._I("prefSeconds"));
-Index: sikuli/sikuli-ide/CMakeLists.txt
-===================================================================
---- sikuli.orig/sikuli-ide/CMakeLists.txt	2013-06-07 08:02:38.000000000 +0200
-+++ sikuli/sikuli-ide/CMakeLists.txt	2013-06-07 08:02:38.000000000 +0200
-@@ -48,6 +48,7 @@
- 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")
-+SET(COMMON_JAR "/usr/share/java/jgoodies-common.jar")
- 
- 
- FILE(MAKE_DIRECTORY ${BINARY_DIR})
-@@ -79,7 +80,7 @@
- SET(ARGS "")
- 
- SET(CLASSPATH 
--   ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}/usr/share/java/jython.jar
-+   ${SIKULI_SCRIPT_JAR}${SEP}${JUNIT_JAR}${SEP}${SWING_LAYOUT_JAR}${SEP}${COMMONS_CLI_JAR}${SEP}${JSON_SIMPLE_JAR}${SEP}${SWINGX_JAR}${SEP}${MAC_WIDGETS_JAR}${SEP}${FORMS_JAR}${SEP}${COMMON_JAR}${SEP}/usr/share/java/jython.jar
- )
- 
- SET(JAR_FILE sikuli-ide.jar)
-@@ -141,6 +142,7 @@
-                  ${SWING_LAYOUT_JAR} ${COMMONS_CLI_JAR}
-                  ${BINARY_DIR}/${JAR_FILE} ${JSON_SIMPLE_JAR}
-                  ${SWINGX_JAR} ${MAC_WIDGETS_JAR} ${FORMS_JAR}
-+		 ${COMMON_JAR}
- )
- 
- ## Windows Package
-Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
-===================================================================
---- sikuli.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2013-06-07 08:02:38.000000000 +0200
-+++ 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-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
-+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/junit.jar:/usr/share/sikuli/sikuli-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
+--- a/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
++++ b/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+@@ -6,6 +6,7 @@ LC_NUMERIC=C exec /usr/bin/java \
+ /usr/share/java/asm3-commons.jar:\
+ /usr/share/java/antlr3-runtime.jar:\
+ /usr/share/java/libconstantine-java.jar:\
++/usr/share/java/jgoodies-common.jar:\
+ /usr/share/java/jython.jar:\
+ /usr/share/java/commons-cli.jar:\
+ /usr/share/java/JXGrabKey.jar:\

=== modified file 'debian/patches/tess3.patch'
--- debian/patches/tess3.patch	2012-02-15 15:17:58 +0000
+++ debian/patches/tess3.patch	2014-09-05 14:54:04 +0000
@@ -2,11 +2,9 @@
  This patch applies against tesseract3 branch of sikuli to bring support
  for the 3.02 version of tesseract.
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli/cmake_modules/FindTesseract.cmake
-===================================================================
---- sikuli.orig/cmake_modules/FindTesseract.cmake	2012-02-15 01:02:23.000000000 +0100
-+++ sikuli/cmake_modules/FindTesseract.cmake	2012-02-15 10:10:54.000000000 +0100
-@@ -21,23 +21,14 @@
+--- a/cmake_modules/FindTesseract.cmake
++++ b/cmake_modules/FindTesseract.cmake
+@@ -21,23 +21,14 @@ find_path(Tesseract_INCLUDE_DIR
          ${Tesseract_PKGCONF_INCLUDE_DIRS}
  )
  
@@ -33,11 +31,9 @@
  
  # Set the include dir variables and the libraries and let libfind_process do the rest.
  # NOTE: Singular variables for this library, plural for libraries this this lib depends on.
-Index: sikuli/sikuli-script/src/main/native/tessocr.cpp
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/tessocr.cpp	2012-02-15 01:02:23.000000000 +0100
-+++ sikuli/sikuli-script/src/main/native/tessocr.cpp	2012-02-15 10:10:07.000000000 +0100
-@@ -404,10 +404,9 @@
+--- a/sikuli-script/src/main/native/tessocr.cpp
++++ b/sikuli-script/src/main/native/tessocr.cpp
+@@ -404,10 +404,9 @@ OCR::init(const char* datapath){
     //we have to use setenv instead.
     setenv("TESSDATA_PREFIX", datapath, 1);
  #endif

=== modified file 'debian/patches/tessdata.patch'
--- debian/patches/tessdata.patch	2012-04-16 11:21:08 +0000
+++ debian/patches/tessdata.patch	2014-09-05 14:54:04 +0000
@@ -4,11 +4,9 @@
  environment variable.
 Author: Gilles Filippini <[e-mail]>
 Bug-Debian: http://bugs.debian.org/667513
-Index: sikuli/sikuli-script/CMakeLists.txt
-===================================================================
---- sikuli.orig/sikuli-script/CMakeLists.txt	2012-04-15 22:14:18.000000000 +0200
-+++ sikuli/sikuli-script/CMakeLists.txt	2012-04-15 22:14:18.000000000 +0200
-@@ -156,7 +156,7 @@
+--- a/sikuli-script/CMakeLists.txt
++++ b/sikuli-script/CMakeLists.txt
+@@ -156,7 +156,7 @@ add_custom_target(${JAR_FILE}.libs-in-ja
  add_dependencies(${JAR_FILE} 
          ${JAR_FILE}.classes-in-jar 
          #${JAR_FILE}.python-src-in-jar
@@ -17,11 +15,9 @@
          #${JAR_FILE}.libs-in-jar
          #${JAR_FILE}.includes-in-jar
          #${JAR_FILE}.jython-in-jar
-Index: sikuli/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java
-===================================================================
---- sikuli.orig/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java	2012-04-15 22:14:18.000000000 +0200
-+++ sikuli/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java	2012-04-15 22:54:45.000000000 +0200
-@@ -11,6 +11,7 @@
+--- a/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java
++++ b/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java
+@@ -11,6 +11,7 @@ import java.net.URL;
  import java.util.Enumeration;
  import java.util.List;
  import java.util.LinkedList;
@@ -29,7 +25,7 @@
  
  import org.sikuli.script.natives.Mat;
  import org.sikuli.script.natives.Vision;
-@@ -40,19 +41,14 @@
+@@ -40,19 +41,14 @@ public class TextRecognizer {
     public void init(){
        Debug.info("Text Recognizer inited.");
        try{
@@ -51,11 +47,9 @@
           e.printStackTrace();         
        }
     }
-Index: sikuli/sikuli-script/src/main/native/tessocr.cpp
-===================================================================
---- sikuli.orig/sikuli-script/src/main/native/tessocr.cpp	2012-04-15 22:14:18.000000000 +0200
-+++ sikuli/sikuli-script/src/main/native/tessocr.cpp	2012-04-16 00:11:53.000000000 +0200
-@@ -362,7 +362,7 @@
+--- a/sikuli-script/src/main/native/tessocr.cpp
++++ b/sikuli-script/src/main/native/tessocr.cpp
+@@ -362,7 +362,7 @@ unsigned char* x2(const unsigned char* i
  }
  
  bool OCR::isInitialized = false;
@@ -64,7 +58,7 @@
  string OCR::_lang = "eng";
  
  void OCR::setParameter(std::string param, std::string value){
-@@ -394,16 +394,8 @@
+@@ -394,16 +394,8 @@ OCR::init(const char* datapath){
     if (isInitialized)
        return;
     

=== modified file 'debian/patches/use-java-libs-from-debian.patch'
--- debian/patches/use-java-libs-from-debian.patch	2012-02-15 15:17:58 +0000
+++ debian/patches/use-java-libs-from-debian.patch	2014-09-05 14:54:04 +0000
@@ -3,11 +3,9 @@
  tweak the makefiles to use instead the same libraries provided by
  Debian packages from Build-Depends.
 Author: Gilles Filippini <[e-mail]>
-Index: sikuli/sikuli-ide/CMakeLists.txt
-===================================================================
---- sikuli.orig/sikuli-ide/CMakeLists.txt	2011-11-10 23:53:01.000000000 +0100
-+++ sikuli/sikuli-ide/CMakeLists.txt	2012-02-13 23:18:35.000000000 +0100
-@@ -41,13 +41,13 @@
+--- a/sikuli-ide/CMakeLists.txt
++++ b/sikuli-ide/CMakeLists.txt
+@@ -41,13 +41,13 @@ SET(JAVA_TEST_FOR_HUDSON_XML "../hudson-
  SET(TEST_CLASS_DIR "${CMAKE_BINARY_DIR}/test") 
  
  SET(SIKULI_SCRIPT_JAR "${COMMON_LIB_DIR}/sikuli-script.jar")
@@ -28,7 +26,7 @@
  
  
  FILE(MAKE_DIRECTORY ${BINARY_DIR})
-@@ -79,7 +79,7 @@
+@@ -79,7 +79,7 @@ ENDIF()
  SET(ARGS "")
  
  SET(CLASSPATH 
@@ -37,7 +35,7 @@
  )
  
  SET(JAR_FILE sikuli-ide.jar)
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ SET(RESOURCES icons META-INF scripts i18
  
  IF(LINUX)
     SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-linux.MF)
@@ -46,7 +44,7 @@
  ELSEIF(WIN32)
     SET(MANIFEST ${RESOURCE_DIR}/META-INF/MANIFEST-win32.MF)
     #SET(CLASSPATH ${CLASSPATH}${SEP}${JINTELLITYPE_JAR})
-@@ -168,7 +168,7 @@
+@@ -168,7 +168,7 @@ IF(LINUX)
     SET(FRAMEWORKS_IN_APP_DIR  ${JAR_IN_APP_DIR}/libs)
     SET(JAR_LIB_DIR  ${JAR_DIR}/META-INF/lib)
  
@@ -55,7 +53,7 @@
     SET(jnilibs "")
     FILE(GLOB sikuli_script_jnilibs "${BASE_DIR}/../sikuli-script/target/lib/*.so")
     LIST(APPEND jnilibs ${sikuli_script_jnilibs})
-@@ -224,7 +224,6 @@
+@@ -224,7 +224,6 @@ IF(LINUX)
     add_custom_target( ${APP_FILE}.framework 
        COMMAND ${CMAKE_COMMAND} -E make_directory ${FRAMEWORKS_IN_APP_DIR}
        COMMAND cp ${jnilibs} ${FRAMEWORKS_IN_APP_DIR}
@@ -63,7 +61,7 @@
        COMMENT "Packaging Frameworks in App"
     )
     add_dependencies( ${APP_FILE} ${APP_FILE}.framework ) 
-@@ -239,7 +238,7 @@
+@@ -239,7 +238,7 @@ IF(WIN32)
     SET(LIB_GRABKEY "${COMMON_LIB_DIR}/jintellitype-1.3.6/JIntellitype.dll")
     add_custom_target( ${JAR_FILE}.framework 
        COMMAND ${CMAKE_COMMAND} -E make_directory ${JAR_LIB_DIR}
@@ -72,11 +70,9 @@
        COMMENT "Packaging Frameworks in Jar"
     )
     add_dependencies( ${JAR_FILE} ${JAR_FILE}.framework ) 
-Index: sikuli/sikuli-script/CMakeLists.txt
-===================================================================
---- sikuli.orig/sikuli-script/CMakeLists.txt	2012-02-13 22:43:36.000000000 +0100
-+++ sikuli/sikuli-script/CMakeLists.txt	2012-02-13 23:18:35.000000000 +0100
-@@ -38,8 +38,7 @@
+--- a/sikuli-script/CMakeLists.txt
++++ b/sikuli-script/CMakeLists.txt
+@@ -38,8 +38,7 @@ SET(CMAKE_SWIG_OUTDIR ${CMAKE_BINARY_DIR
  SET(COMMON_LIB_DIR "${BASE_DIR}/../lib")
  
  # dependent libs
@@ -86,7 +82,7 @@
  
  #SET(INCLUDE_LIB_DIR "${BASE_DIR}/lib")
  SET(INCLUDE_LIB_DIR "${COMMON_LIB_DIR}/mx-native-loader-1.2/target/classes")
-@@ -51,10 +50,10 @@
+@@ -51,10 +50,10 @@ SET(BINARY_LIB_DIR "${BINARY_DIR}/lib")
  SET(JAR_DIR "${CMAKE_BINARY_DIR}/jar")
  SET(JAR_LIB_DIR  ${JAR_DIR}/META-INF/lib)
  
@@ -101,7 +97,7 @@
  
  SET(CLASSPATH 
     ${INCLUDE_LIB_DIR}${SEP}${JYTHON_JAR}${SEP}.
-@@ -156,12 +155,12 @@
+@@ -156,12 +155,12 @@ add_custom_target(${JAR_FILE}.libs-in-ja
  
  add_dependencies(${JAR_FILE} 
          ${JAR_FILE}.classes-in-jar 
@@ -119,7 +115,7 @@
  )
  
  IF(WIN32)
-@@ -196,9 +195,9 @@
+@@ -196,9 +195,9 @@ IF(LINUX)
        )
     ENDIF()
  
@@ -132,7 +128,7 @@
  ENDIF(LINUX)
  
  IF(LINUX)
-@@ -213,8 +212,8 @@
+@@ -213,8 +212,8 @@ IF(LINUX)
        COMMENT "Packaging JXGrabKey in Jar"
     )
  ENDIF(LINUX)

=== modified file 'sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh'
--- sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2013-07-13 18:44:41 +0000
+++ sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh	2014-09-05 14:54:04 +0000
@@ -1,2 +1,31 @@
 #!/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/jgoodies-common.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/junit.jar:/usr/share/sikuli/sikuli-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
+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/jgoodies-common.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/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar:\
+/usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar:\
+/usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.jar:\
+/usr/share/sikuli/sikuli-ide.jar:\
+/usr/share/java/sikuli-script.jar" \
+	-Dsikuli.console=true \
+	-Dsikuli.debug=0 \
+	-Xms64M -Xmx512M \
+	-Dfile.encoding=UTF-8 \
+	-Dpython.home=/usr/share/jython \
+	-Dpython.path="/usr/share/sikuli/Lib" \
+	-Dpython.cachedir=$HOME/.jython-cache \
+	org.sikuli.ide.SikuliIDE "$@"

=== modified file 'sikuli-script/target/sikuli-script.sh'
--- sikuli-script/target/sikuli-script.sh	2012-06-04 18:39:45 +0000
+++ sikuli-script/target/sikuli-script.sh	2014-09-05 14:54:04 +0000
@@ -1,2 +1,18 @@
 #!/bin/sh
-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/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/maven-repo/org/jruby/extras/jaffl/debian/jaffl-debian.jar:\
+/usr/share/maven-repo/org/jruby/ext/posix/jnr-posix/debian/jnr-posix-debian.jar:\
+/usr/share/maven-repo/com/google/guava/guava/debian/guava-debian.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 "$@"