[sikuli] 05/21: Refresh patches.
Gilles Filippini
pini at debian.org
Sat Nov 7 12:11:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch master
in repository sikuli.
commit a65f1af27d2948fadda69d10648d792bb7d68f72
Author: Gilles Filippini <pini at debian.org>
Date: Mon Nov 2 01:22:43 2015 +0100
Refresh patches.
---
debian/changelog | 3 +
debian/patches/add-classpath.patch | 17 +++-
debian/patches/autotoolize-vision-proxy.patch | 30 +++---
debian/patches/basics-exclude-windows-mac.patch | 67 ++++++++------
debian/patches/dependency-opencv.patch | 2 +-
debian/patches/drop-useless-resources.patch | 8 +-
debian/patches/fix-image-path.patch | 14 ---
debian/patches/install-extension.patch | 2 +-
debian/patches/native.patch | 117 ++++++++----------------
debian/patches/no-maven-repo-dependencies.patch | 48 ++++++----
debian/patches/pom-removed-modules.patch | 40 +++-----
debian/patches/python-shebang.patch | 6 +-
debian/patches/series | 3 +-
debian/patches/setTextAndMnemonic.patch | 24 ++---
14 files changed, 172 insertions(+), 209 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 304503f..02b8e7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
sikulix (1.1.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches.
+ * Disable patch jruby-compat-1.9.patch (probably not needed anymore).
+ * Drop patch fix-image-path.patch (applied upstream).
-- Gilles Filippini <pini at debian.org> Sun, 01 Nov 2015 20:58:27 +0100
diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch
index 68327ea..892f8b0 100644
--- a/debian/patches/add-classpath.patch
+++ b/debian/patches/add-classpath.patch
@@ -6,9 +6,9 @@ Index: sikuli/pom.xml
--- sikuli.orig/pom.xml
+++ sikuli/pom.xml
@@ -135,6 +135,24 @@
- </modules>
+ </modules>
- <build>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
@@ -27,6 +27,13 @@ Index: sikuli/pom.xml
+ </plugin>
+ </plugins>
+ </pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+@@ -148,4 +166,4 @@
+ </plugin>
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
diff --git a/debian/patches/autotoolize-vision-proxy.patch b/debian/patches/autotoolize-vision-proxy.patch
index 257bc18..0fec510 100644
--- a/debian/patches/autotoolize-vision-proxy.patch
+++ b/debian/patches/autotoolize-vision-proxy.patch
@@ -1,10 +1,10 @@
Description: Use autotools to build the VisionProxy JNI
and the associated swig glue.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/Libsvision/pom.xml
+Index: sikuli/Libslux/pom.xml
===================================================================
---- sikuli.orig/Libsvision/pom.xml
-+++ sikuli/Libsvision/pom.xml
+--- sikuli.orig/Libslux/pom.xml
++++ sikuli/Libslux/pom.xml
@@ -24,6 +24,75 @@
<build>
<plugins>
@@ -23,7 +23,7 @@ Index: sikuli/Libsvision/pom.xml
+ <argument>-c</argument>
+ <argument>
+set -e
-+cd src/main/java/native/Vision
++cd src/main/resources/srcnativelibs/Vision
+mkdir -p m4
+autoreconf -i
+automake
@@ -40,7 +40,7 @@ Index: sikuli/Libsvision/pom.xml
+ <executable>/usr/bin/make</executable>
+ <arguments>
+ <argument>-C</argument>
-+ <argument>src/main/java/native/Vision</argument>
++ <argument>src/main/resources/srcnativelibs/Vision</argument>
+ <argument>all</argument>
+ </arguments>
+ </configuration>
@@ -53,7 +53,7 @@ Index: sikuli/Libsvision/pom.xml
+ <executable>/usr/bin/make</executable>
+ <arguments>
+ <argument>-C</argument>
-+ <argument>src/main/java/native/Vision</argument>
++ <argument>src/main/resources/srcnativelibs/Vision</argument>
+ <argument>install</argument>
+ </arguments>
+ </configuration>
@@ -68,7 +68,7 @@ Index: sikuli/Libsvision/pom.xml
+ <argument>-c</argument>
+ <argument>
+set -e
-+cd src/main/java/native/Vision
++cd src/main/resources/srcnativelibs/Vision
+[ ! -f Makefile ] || /usr/bin/make clean
+rm -fr configure Makefile Makefile.in aclocal.m4 m4 config.* compile missing libtool ltmain.sh install-sh depcomp
+ </argument>
@@ -81,10 +81,10 @@ Index: sikuli/Libsvision/pom.xml
<artifactId>maven-jar-plugin</artifactId>
<version>2.4</version>
<configuration>
-Index: sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/Makefile.am
===================================================================
--- /dev/null
-+++ sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/Makefile.am
@@ -0,0 +1,32 @@
+ACLOCAL_AMFLAGS = -I m4
+
@@ -92,21 +92,21 @@ Index: sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
+
+jnidir = $(CURDIR)/dist/$(shell echo $(host) | sed 's/-[^-]*-/-/')
+jni_LTLIBRARIES = libVisionProxy.la
-+libVisionProxy_la_SOURCES := cvgui.cpp finder.cpp pyramid-template-matcher.cpp sikuli-debug.cpp tessocr.cpp vision.cpp vision_wrap.cxx
++libVisionProxy_la_SOURCES := cvgui.cpp finder.cpp pyramid-template-matcher.cpp sikuli-debug.cpp tessocr.cpp vision.cpp vision_wrap.cxx
+
+libVisionProxy_la_CPPFLAGS = -I$(JAVAHOME)/include
+libVisionProxy_la_LIBADD = -ltesseract -lopencv_core -lopencv_highgui -lopencv_imgproc
+libVisionProxy_la_LDFLAGS = -module -avoid-version -shared
+
+SWIGSRC := vision.swig
-+SWIGOUT := ../../org/sikuli/libsvision
++SWIGOUT := ../../../../../../API/src/main/java/org/sikuli/natives
+SWIGJAVAFILES := DebugCategories.java FindInput.java FindResult.java FindResults.java Mat.java \
-+ OCR.java OCRChar.java OCRChars.java OCRLine.java OCRLines.java OCRParagraph.java \
++ OCRChar.java OCRChars.java OCR.java OCRLine.java OCRLines.java OCRParagraph.java \
+ OCRParagraphs.java OCRRect.java OCRText.java OCRWord.java OCRWords.java \
+ TARGET_TYPE.java Vision.java VisionProxy.java VisionProxyJNI.java
+
+vision_wrap.cxx: vision.swig
-+ $(SWIG) -c++ -java -package org.sikuli.libsvision -outdir $(SWIGOUT) $< || ( $(MAKE) cleanswig && false )
++ $(SWIG) -c++ -java -package org.sikuli.natives -outdir $(SWIGOUT) $< || ( $(MAKE) cleanswig && false )
+
+# We don't want the .la file
+install-data-hook:
@@ -118,10 +118,10 @@ Index: sikuli/Libsvision/src/main/java/native/Vision/Makefile.am
+cleanswig:
+ cd $(SWIGOUT) && rm -f $(SWIGJAVAFILES)
+ rm -f *.cxx
-Index: sikuli/Libsvision/src/main/java/native/Vision/configure.ac
+Index: sikuli/Libslux/src/main/resources/srcnativelibs/Vision/configure.ac
===================================================================
--- /dev/null
-+++ sikuli/Libsvision/src/main/java/native/Vision/configure.ac
++++ sikuli/Libslux/src/main/resources/srcnativelibs/Vision/configure.ac
@@ -0,0 +1,29 @@
+AC_INIT(sikulix-vision-proxy,1.0.1)
+
diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch
index 7e7ca7b..86ca40b 100644
--- a/debian/patches/basics-exclude-windows-mac.patch
+++ b/debian/patches/basics-exclude-windows-mac.patch
@@ -2,14 +2,47 @@ Description: Exclude Windows and Mac specific source file from the build.
WindowsHotkeyManager.java fails to compile on Linux because it relies
on Windows specific library com.melloware.jintellitype.
Author: Gilles Filippini <pini at debian>
+Index: sikuli/API/src/main/java/org/sikuli/script/RunTime.java
+===================================================================
+--- sikuli.orig/API/src/main/java/org/sikuli/script/RunTime.java
++++ sikuli/API/src/main/java/org/sikuli/script/RunTime.java
+@@ -44,7 +44,6 @@ import org.sikuli.basics.Debug;
+ import org.sikuli.basics.FileManager;
+ import org.sikuli.basics.Settings;
+ import org.sikuli.util.JythonHelper;
+-import org.sikuli.util.SysJNA;
+ import org.sikuli.util.LinuxSupport;
+
+ /**
+@@ -994,16 +993,16 @@ Point pNull = new Point(0, 0);
+ }
+
+ private void addToWindowsSystemPath(File fLibsFolder) {
+- String syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
++ String syspath = "";
+ if (syspath == null) {
+ terminate(1, "addToWindowsSystemPath: cannot access system path");
+ } else {
+ String libsPath = (fLibsFolder.getAbsolutePath()).replaceAll("/", "\\");
+ if (!syspath.toUpperCase().contains(libsPath.toUpperCase())) {
+- if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", libsPath + ";" + syspath)) {
++ if (true) {
+ Sikulix.terminate(999);
+ }
+- syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
++ syspath = "";
+ if (!syspath.toUpperCase().contains(libsPath.toUpperCase())) {
+ log(-1, "addToWindowsSystemPath: adding to system path did not work:\n%s", syspath);
+ terminate(1, "addToWindowsSystemPath: did not work - see error");
Index: sikuli/API/pom.xml
===================================================================
--- sikuli.orig/API/pom.xml
+++ sikuli/API/pom.xml
-@@ -90,6 +90,20 @@
+@@ -109,6 +109,20 @@
+ </archive>
</configuration>
</plugin>
- <plugin>
++ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>debian</version>
+ <configuration>
@@ -17,38 +50,12 @@ Index: sikuli/API/pom.xml
+ <excludes>
+ <exclude>**/basics/WindowsHotkeyManager.java</exclude>
+ <exclude>**/basics/MacHotkeyManager.java</exclude>
-+ <exclude>**/basics/SysJNA.java</exclude>
++ <exclude>**/util/SysJNA.java</exclude>
+ <exclude>**/natives/WinUtil.java</exclude>
+ <exclude>**/natives/MacUtil.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
-+ <plugin>
+ <!-- <plugin>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
- <configuration>
-Index: sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
-===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/basics/ResourceLoader.java
-+++ sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
-@@ -539,17 +539,17 @@ public class ResourceLoader {
- log(lvl, "trying: " + path);
- if (Settings.isWindows() && !initDone) {
- log(lvl, "Running on Windows - checking system path!");
-- String syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
-+ String syspath = "";
- if (syspath == null) {
- Sikulix.terminate(999);
- } else {
- path = (new File(path).getAbsolutePath()).replaceAll("/", "\\");
- if (!syspath.toUpperCase().contains(path.toUpperCase())) {
-- if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", path + ";" + syspath)) {
-+ if (true) {
- Sikulix.terminate(999);
- }
- log(lvl, "Added libs dir to path: " + path);
-- syspath = SysJNA.WinKernel32.getEnvironmentVariable("PATH");
-+ syspath = "";
- if (!syspath.toUpperCase().contains(path.toUpperCase())) {
- log(-1, "Adding to path did not work:\n%s", syspath);
- Sikulix.terminate(999);
diff --git a/debian/patches/dependency-opencv.patch b/debian/patches/dependency-opencv.patch
index 1fb9a14..db63cfa 100644
--- a/debian/patches/dependency-opencv.patch
+++ b/debian/patches/dependency-opencv.patch
@@ -4,7 +4,7 @@ Index: sikuli/API/pom.xml
===================================================================
--- sikuli.orig/API/pom.xml
+++ sikuli/API/pom.xml
-@@ -34,6 +34,13 @@
+@@ -44,6 +44,13 @@
<version>1.0</version>
</dependency>
<dependency>
diff --git a/debian/patches/drop-useless-resources.patch b/debian/patches/drop-useless-resources.patch
index 028f38b..561fa76 100644
--- a/debian/patches/drop-useless-resources.patch
+++ b/debian/patches/drop-useless-resources.patch
@@ -4,13 +4,13 @@ Index: sikuli/API/pom.xml
===================================================================
--- sikuli.orig/API/pom.xml
+++ sikuli/API/pom.xml
-@@ -64,6 +64,9 @@
+@@ -74,6 +74,9 @@
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
+ <excludes>
+ <exclude>Commands/**</exclude>
+ </excludes>
- </resource>
- <resource>
- <directory>
+ <includes>
+ <include>Settings/*</include>
+ </includes>
diff --git a/debian/patches/fix-image-path.patch b/debian/patches/fix-image-path.patch
deleted file mode 100644
index f432f88..0000000
--- a/debian/patches/fix-image-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: backport fix from upstream commit 9c8aa74
-Index: sikuli/API/src/main/java/org/sikuli/script/ImagePath.java
-===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/script/ImagePath.java
-+++ sikuli/API/src/main/java/org/sikuli/script/ImagePath.java
-@@ -314,7 +314,7 @@ public class ImagePath {
- */
- public static boolean add(String mainPath, String altPath) {
- mainPath = FileManager.normalize(mainPath);
-- mainPath = FileManager.normalize(altPath);
-+ altPath = FileManager.normalize(altPath);
- PathEntry path = makePathURL(mainPath, altPath);
- if (path != null) {
- if (hasPath(path) < 0) {
diff --git a/debian/patches/install-extension.patch b/debian/patches/install-extension.patch
index 8d91c11..784bb17 100644
--- a/debian/patches/install-extension.patch
+++ b/debian/patches/install-extension.patch
@@ -5,7 +5,7 @@ Index: sikuli/API/src/main/java/org/sikuli/basics/ExtensionManager.java
===================================================================
--- sikuli.orig/API/src/main/java/org/sikuli/basics/ExtensionManager.java
+++ sikuli/API/src/main/java/org/sikuli/basics/ExtensionManager.java
-@@ -60,12 +60,16 @@ public class ExtensionManager {
+@@ -58,12 +58,16 @@ public class ExtensionManager {
if (targetFile.exists()) {
targetFile.delete();
}
diff --git a/debian/patches/native.patch b/debian/patches/native.patch
index e0cd717..4d5f5c1 100644
--- a/debian/patches/native.patch
+++ b/debian/patches/native.patch
@@ -4,120 +4,81 @@ Description: Use System's native library loader
libraries are shipped in their own binary package and we use the standard
native library loader.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java
-===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/script/TextRecognizer.java
-+++ sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java
-@@ -30,7 +30,7 @@ public class TextRecognizer {
- private static boolean _init_succeeded = false;
-
- static {
-- FileManager.loadLibrary("VisionProxy");
-+ System.loadLibrary("VisionProxy");
- }
-
- private TextRecognizer() {
-Index: sikuli/API/src/main/java/org/sikuli/script/App.java
-===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/script/App.java
-+++ sikuli/API/src/main/java/org/sikuli/script/App.java
-@@ -45,7 +45,7 @@ public class App {
- new Screen();
- String libName = _osUtil.getLibName();
- if (!libName.isEmpty()) {
-- FileManager.loadLibrary(libName);
-+ System.loadLibrary(libName);
- }
- }
-
Index: sikuli/API/src/main/java/org/sikuli/script/Screen.java
===================================================================
--- sikuli.orig/API/src/main/java/org/sikuli/script/Screen.java
+++ sikuli/API/src/main/java/org/sikuli/script/Screen.java
-@@ -53,7 +53,7 @@ public class Screen extends Region imple
+@@ -54,7 +54,7 @@ public class Screen extends Region imple
//<editor-fold defaultstate="collapsed" desc="Initialization">
static {
-- FileManager.loadLibrary("VisionProxy");
+- RunTime.loadLibrary("VisionProxy");
+ System.loadLibrary("VisionProxy");
initScreens(false);
}
-
+ private long lastCaptureTime = -1;
Index: sikuli/API/src/main/java/org/sikuli/script/Finder.java
===================================================================
--- sikuli.orig/API/src/main/java/org/sikuli/script/Finder.java
+++ sikuli/API/src/main/java/org/sikuli/script/Finder.java
-@@ -36,7 +36,7 @@ public class Finder implements Iterator<
- private boolean repeating = false;
+@@ -39,7 +39,7 @@ public class Finder implements Iterator<
+ private boolean screenFinder = true;
static {
-- FileManager.loadLibrary("VisionProxy");
+- RunTime.loadLibrary("VisionProxy");
+ System.loadLibrary("VisionProxy");
}
private static String me = "Finder: ";
-Index: sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
+Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java
===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
-+++ sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
-@@ -12,7 +12,7 @@ import jxgrabkey.JXGrabKey;
+--- sikuli.orig/API/src/main/java/org/sikuli/script/TextRecognizer.java
++++ sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java
+@@ -32,7 +32,7 @@ public class TextRecognizer {
+ private static int lvl = 3;
+
+ static {
+- RunTime.loadLibrary("VisionProxy");
++ System.loadLibrary("VisionProxy");
+ }
+
+ private TextRecognizer() {
+Index: sikuli/API/src/main/java/org/sikuli/basics/VDictProxy.java
+===================================================================
+--- sikuli.orig/API/src/main/java/org/sikuli/basics/VDictProxy.java
++++ sikuli/API/src/main/java/org/sikuli/basics/VDictProxy.java
+@@ -19,7 +19,7 @@ public class VDictProxy<T> {
+ private Map<Integer, T> _i2obj = new HashMap<Integer, T>();
- public class LinuxHotkeyManager extends HotkeyManager {
- static{
-- FileManager.loadLibrary("JXGrabKey");
-+ System.loadLibrary("JXGrabKey");
+ static {
+- RunTime.loadLibrary("VDictProxy");
++ System.loadLibrary("VDictProxy");
}
- class HotkeyData {
+ public VDictProxy(){
Index: sikuli/API/src/main/java/org/sikuli/basics/MacHotkeyManager.java
===================================================================
--- sikuli.orig/API/src/main/java/org/sikuli/basics/MacHotkeyManager.java
+++ sikuli/API/src/main/java/org/sikuli/basics/MacHotkeyManager.java
-@@ -20,7 +20,7 @@ public class MacHotkeyManager extends Ho
+@@ -21,7 +21,7 @@ public class MacHotkeyManager extends Ho
static final int CARBON_MASK_CTRL = 0x1000;
static {
-- FileManager.loadLibrary("MacHotkeyManager");
+- RunTime.loadLibrary("MacHotkeyManager");
+ System.loadLibrary("MacHotkeyManager");
}
@Override
-Index: sikuli/API/src/main/java/org/sikuli/basics/VDictProxy.java
+Index: sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/basics/VDictProxy.java
-+++ sikuli/API/src/main/java/org/sikuli/basics/VDictProxy.java
-@@ -18,7 +18,7 @@ public class VDictProxy<T> {
- private Map<Integer, T> _i2obj = new HashMap<Integer, T>();
+--- sikuli.orig/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
++++ sikuli/API/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java
+@@ -15,7 +15,7 @@ import org.sikuli.script.RunTime;
- static {
-- FileManager.loadLibrary("VDictProxy");
-+ System.loadLibrary("VDictProxy");
+ public class LinuxHotkeyManager extends HotkeyManager {
+ static{
+- RunTime.loadLibrary("JXGrabKey");
++ System.loadLibrary("JXGrabKey");
}
- public VDictProxy(){
-Index: sikuli/API/src/main/java/edu/unh/iol/dlc/VNCScreen.java
-===================================================================
---- sikuli.orig/API/src/main/java/edu/unh/iol/dlc/VNCScreen.java
-+++ sikuli/API/src/main/java/edu/unh/iol/dlc/VNCScreen.java
-@@ -70,7 +70,7 @@ public class VNCScreen extends Region im
- //Screen Methods**************************************************************/
-
- static{
-- FileManager.loadLibrary("VisionProxy");
-+ System.loadLibrary("VisionProxy");
- initScreens(false);
- }
-
-Index: sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
-===================================================================
---- sikuli.orig/API/src/main/java/org/sikuli/basics/ResourceLoader.java
-+++ sikuli/API/src/main/java/org/sikuli/basics/ResourceLoader.java
-@@ -170,6 +170,8 @@ public class ResourceLoader {
- log(-1, "Currently only Sikuli libs supported!");
- return false;
- }
-+ // Debian package: do nothing
-+ initDone = true;
-
- if (initDone) {
- return true;
+ class HotkeyData {
diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch
index db0fdb9..8cc4a3d 100644
--- a/debian/patches/no-maven-repo-dependencies.patch
+++ b/debian/patches/no-maven-repo-dependencies.patch
@@ -5,20 +5,34 @@ Index: sikuli/IDE/pom.xml
--- sikuli.orig/IDE/pom.xml
+++ sikuli/IDE/pom.xml
@@ -37,6 +37,8 @@
- <groupId>org.python</groupId>
- <artifactId>jython-standalone</artifactId>
- <version>${sikulixjythonversion}</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/jython.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.jruby</groupId>
-@@ -67,6 +69,8 @@
- <groupId>com.explodingpixels</groupId>
- <artifactId>mac_widgets</artifactId>
- <version>0.9.5</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/mac_widgets.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>com.sikulix</groupId>
+ <groupId>org.python</groupId>
+ <artifactId>jython-standalone</artifactId>
+ <version>${sikulixjythonversion}</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/jython.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>org.jruby</groupId>
+@@ -48,11 +50,11 @@
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+- <!-- <dependency>
++ <dependency>
+ <groupId>org.swinglabs.swingx</groupId>
+ <artifactId>swingx-core</artifactId>
+ <version>1.6.6-SNAPSHOT</version>
+- </dependency>-->
++ </dependency>
+ <dependency>
+ <groupId>org.kohsuke.metainf-services</groupId>
+ <artifactId>metainf-services</artifactId>
+@@ -113,6 +115,8 @@
+ <groupId>com.explodingpixels</groupId>
+ <artifactId>mac_widgets</artifactId>
+ <version>0.9.5</version>
++ <scope>system</scope>
++ <systemPath>/usr/share/java/mac_widgets.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>com.sikulix</groupId>
diff --git a/debian/patches/pom-removed-modules.patch b/debian/patches/pom-removed-modules.patch
index 10791ad..cca9ba4 100644
--- a/debian/patches/pom-removed-modules.patch
+++ b/debian/patches/pom-removed-modules.patch
@@ -4,32 +4,18 @@ Index: sikuli/pom.xml
===================================================================
--- sikuli.orig/pom.xml
+++ sikuli/pom.xml
-@@ -117,21 +117,12 @@
+@@ -124,14 +124,9 @@
- <modules>
- <module>Libsvision</module>
-- <module>Libslux</module>
-- <module>Libsmac</module>
-- <module>Libswin</module>
- <module>API</module>
-- <module>APIFat</module>
- <module>Jygments4SikuliX</module>
- <module>IDE</module>
-- <module>IDEFat</module>
-- <module>Setup</module>
-- <module>MacApp</module>
-- <module>Tesseract</module>
- <module>Tesseract4SikuliX</module>
- <module>Remote</module>
- <module>Guide</module>
-- <module>TestRunMaven</module>
- </modules>
+ <modules>
+ <module>Libslux</module>
+- <module>Libsmac</module>
+- <module>Libswin</module>
+ <module>API</module>
+- <module>SetupAPI</module>
+ <module>Jygments4SikuliX</module>
+ <module>IDE</module>
+- <module>SetupIDE</module>
+- <module>Setup</module>
+ </modules>
- <build>
-@@ -166,4 +157,4 @@
- </plugin>
- </plugins>
- </build>
--</project>
-\ No newline at end of file
-+</project>
+ <build>
diff --git a/debian/patches/python-shebang.patch b/debian/patches/python-shebang.patch
index ddd5d2d..33a513d 100644
--- a/debian/patches/python-shebang.patch
+++ b/debian/patches/python-shebang.patch
@@ -1,8 +1,8 @@
Description: Fix '/usr/bin/env python' shebang
-Index: sikuli/API/src/main/resources/scripts/sikuli2html.py
+Index: sikuli/IDE/src/main/resources/scripts/sikuli2html.py
===================================================================
---- sikuli.orig/API/src/main/resources/scripts/sikuli2html.py
-+++ sikuli/API/src/main/resources/scripts/sikuli2html.py
+--- sikuli.orig/IDE/src/main/resources/scripts/sikuli2html.py
++++ sikuli/IDE/src/main/resources/scripts/sikuli2html.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
diff --git a/debian/patches/series b/debian/patches/series
index 24c79eb..6a457d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,9 +9,8 @@ no-maven-repo-dependencies.patch
drop-useless-resources.patch
add-classpath.patch
pom-removed-modules.patch
-jruby-compat-1.9.patch
+#jruby-compat-1.9.patch
python-shebang.patch
#no-gem-maven-plugin.patch
dependency-opencv.patch
-fix-image-path.patch
diff --git a/debian/patches/setTextAndMnemonic.patch b/debian/patches/setTextAndMnemonic.patch
index 091df4f..65b7786 100644
--- a/debian/patches/setTextAndMnemonic.patch
+++ b/debian/patches/setTextAndMnemonic.patch
@@ -29,15 +29,15 @@ Index: sikuli/IDE/pom.xml
===================================================================
--- sikuli.orig/IDE/pom.xml
+++ sikuli/IDE/pom.xml
-@@ -59,6 +59,11 @@
- <version>1.2.1</version>
- </dependency>
- <dependency>
-+ <groupId>com.jgoodies</groupId>
-+ <artifactId>common</artifactId>
-+ <version>1.4.0</version>
-+ </dependency>
-+ <dependency>
- <groupId>com.explodingpixels</groupId>
- <artifactId>mac_widgets</artifactId>
- <version>0.9.5</version>
+@@ -105,6 +105,11 @@
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
++ <groupId>com.jgoodies</groupId>
++ <artifactId>common</artifactId>
++ <version>1.4.0</version>
++ </dependency>
++ <dependency>
+ <groupId>com.explodingpixels</groupId>
+ <artifactId>mac_widgets</artifactId>
+ <version>0.9.5</version>
--
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