This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit c28a3185f28d8c5f20ebbfd79dc1a4720a342865 Author: Gilles Filippini <[email protected]> Date: Sun Oct 5 23:14:17 2014 +0200 Refresh patches --- debian/patches/add-classpath.patch | 4 ++-- debian/patches/basics-exclude-windows-mac.patch | 6 ++--- debian/patches/drop-useless-resources.patch | 2 +- debian/patches/native.patch | 30 ++++++++++++------------- debian/patches/pom-removed-modules.patch | 13 +++++++++-- 5 files changed, 32 insertions(+), 23 deletions(-) diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch index b572837..47ef81d 100644 --- a/debian/patches/add-classpath.patch +++ b/debian/patches/add-classpath.patch @@ -5,8 +5,8 @@ Index: sikuli/pom.xml =================================================================== --- sikuli.orig/pom.xml +++ sikuli/pom.xml -@@ -253,6 +253,24 @@ - </modules> +@@ -254,6 +254,24 @@ + </modules> <build> + <pluginManagement> diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch index 1258082..ecf07c1 100644 --- a/debian/patches/basics-exclude-windows-mac.patch +++ b/debian/patches/basics-exclude-windows-mac.patch @@ -6,7 +6,7 @@ Index: sikuli/Basics/pom.xml =================================================================== --- sikuli.orig/Basics/pom.xml +++ sikuli/Basics/pom.xml -@@ -100,6 +100,20 @@ +@@ -102,6 +102,20 @@ <mainClass>org.sikuli.basics.RunSetup</mainClass> </configuration> </plugin> @@ -31,7 +31,7 @@ Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java =================================================================== --- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java +++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java -@@ -479,17 +479,17 @@ public class ResourceLoader implements I +@@ -474,17 +474,17 @@ public class ResourceLoader implements I log(lvl, "trying: " + path); if (Settings.isWindows()) { log(lvl, "Running on Windows - checking system path!"); @@ -42,7 +42,7 @@ Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java } else { path = (new File(path).getAbsolutePath()).replaceAll("/", "\\"); if (!syspath.toUpperCase().contains(path.toUpperCase())) { -- if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", syspath + ";" + path)) { +- if (!SysJNA.WinKernel32.setEnvironmentVariable("PATH", path + ";" + syspath)) { + if (true) { SikuliX.terminate(1); } diff --git a/debian/patches/drop-useless-resources.patch b/debian/patches/drop-useless-resources.patch index 49893be..aa0e169 100644 --- a/debian/patches/drop-useless-resources.patch +++ b/debian/patches/drop-useless-resources.patch @@ -4,7 +4,7 @@ Index: sikuli/Basics/pom.xml =================================================================== --- sikuli.orig/Basics/pom.xml +++ sikuli/Basics/pom.xml -@@ -78,6 +78,9 @@ +@@ -80,6 +80,9 @@ <resource> <directory>src/main/resources</directory> <filtering>true</filtering> diff --git a/debian/patches/native.patch b/debian/patches/native.patch index eb1f74d..046dc58 100644 --- a/debian/patches/native.patch +++ b/debian/patches/native.patch @@ -6,9 +6,9 @@ Description: Use System's native library loader Author: Gilles Filippini <[email protected]> Index: sikuli/API/src/main/java/org/sikuli/script/Finder.java =================================================================== ---- sikuli.orig/API/src/main/java/org/sikuli/script/Finder.java 2014-05-06 07:44:35.837778333 +0200 -+++ sikuli/API/src/main/java/org/sikuli/script/Finder.java 2014-05-06 07:44:35.697777456 +0200 -@@ -36,7 +36,7 @@ +--- 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; static { @@ -19,9 +19,9 @@ Index: sikuli/API/src/main/java/org/sikuli/script/Finder.java /** Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java =================================================================== ---- sikuli.orig/API/src/main/java/org/sikuli/script/TextRecognizer.java 2014-05-06 07:44:35.837778333 +0200 -+++ sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java 2014-05-06 07:44:35.701777481 +0200 -@@ -29,7 +29,7 @@ +--- sikuli.orig/API/src/main/java/org/sikuli/script/TextRecognizer.java ++++ sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java +@@ -29,7 +29,7 @@ public class TextRecognizer { private static boolean _init_succeeded = false; static { @@ -32,9 +32,9 @@ Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java private TextRecognizer() { Index: sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java =================================================================== ---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java 2014-05-06 07:44:35.837778333 +0200 -+++ sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java 2014-05-06 07:44:35.705777506 +0200 -@@ -12,7 +12,7 @@ +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java ++++ sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java +@@ -12,7 +12,7 @@ import jxgrabkey.JXGrabKey; public class LinuxHotkeyManager extends HotkeyManager { static{ @@ -45,9 +45,9 @@ Index: sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java class HotkeyData { Index: sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java =================================================================== ---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/VDictProxy.java 2014-05-06 07:44:35.837778333 +0200 -+++ sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java 2014-05-06 07:44:35.705777506 +0200 -@@ -18,7 +18,7 @@ +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/VDictProxy.java ++++ sikuli/Basics/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>(); static { @@ -58,9 +58,9 @@ Index: sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java public VDictProxy(){ Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java =================================================================== ---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2014-05-06 07:44:35.837778333 +0200 -+++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2014-05-06 07:44:35.709777531 +0200 -@@ -149,6 +149,9 @@ +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java ++++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java +@@ -150,6 +150,9 @@ public class ResourceLoader implements I public void check(String what) { mem = "check"; diff --git a/debian/patches/pom-removed-modules.patch b/debian/patches/pom-removed-modules.patch index cb7ae8f..f375d93 100644 --- a/debian/patches/pom-removed-modules.patch +++ b/debian/patches/pom-removed-modules.patch @@ -4,7 +4,7 @@ Index: sikuli/pom.xml =================================================================== --- sikuli.orig/pom.xml +++ sikuli/pom.xml -@@ -232,22 +232,13 @@ +@@ -231,24 +231,13 @@ <modules> <module>Jygments4SikuliX</module> @@ -18,12 +18,21 @@ Index: sikuli/pom.xml - <module>JythonFat</module> <module>JRuby</module> - <module>JRubyFat</module> +- <module>JRubyGem</module> <module>API</module> - <module>APIFat</module> +- <module>APIFatReady</module> <module>IDE</module> - <module>IDEFat</module> - <module>MacApp</module> - <module>Tesseract</module> <module>Remote</module> <module>Guide</module> - </modules> + </modules> +@@ -308,4 +297,4 @@ + <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url> + </repository> --> + </distributionManagement> +-</project> +\ No newline at end of file ++</project> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
