This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 0ec18629f1fa715141933498bc495b0e0e7e73a5 Author: Gilles Filippini <[email protected]> Date: Sun Jun 29 22:58:10 2014 +0200 Refresh patches --- debian/patches/add-classpath.patch | 6 +++--- debian/patches/basics-exclude-windows-mac.patch | 12 ++++++------ debian/patches/drop-useless-resources.patch | 2 +- debian/patches/jruby-compat-1.9.patch | 6 +++--- debian/patches/no-maven-repo-dependencies.patch | 20 ++++++++++---------- debian/patches/pom-removed-modules.patch | 8 ++++---- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/debian/patches/add-classpath.patch b/debian/patches/add-classpath.patch index eb970ec..b572837 100644 --- a/debian/patches/add-classpath.patch +++ b/debian/patches/add-classpath.patch @@ -3,9 +3,9 @@ Description: Configure maven-jar-plugin to add the classpath to the generated Author: Gilles Filippini <[email protected]> Index: sikuli/pom.xml =================================================================== ---- sikuli.orig/pom.xml 2014-05-12 22:51:51.969618284 +0200 -+++ sikuli/pom.xml 2014-05-12 22:54:58.290945148 +0200 -@@ -240,6 +240,24 @@ +--- sikuli.orig/pom.xml ++++ sikuli/pom.xml +@@ -253,6 +253,24 @@ </modules> <build> diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch index 7c42798..1258082 100644 --- a/debian/patches/basics-exclude-windows-mac.patch +++ b/debian/patches/basics-exclude-windows-mac.patch @@ -4,9 +4,9 @@ Description: Exclude Windows and Mac specific source file from the build. Author: Gilles Filippini <pini@debian> Index: sikuli/Basics/pom.xml =================================================================== ---- sikuli.orig/Basics/pom.xml 2014-05-08 18:14:42.973872273 +0200 -+++ sikuli/Basics/pom.xml 2014-05-08 18:15:08.262042501 +0200 -@@ -94,6 +94,20 @@ +--- sikuli.orig/Basics/pom.xml ++++ sikuli/Basics/pom.xml +@@ -100,6 +100,20 @@ <mainClass>org.sikuli.basics.RunSetup</mainClass> </configuration> </plugin> @@ -29,9 +29,9 @@ Index: sikuli/Basics/pom.xml </project> Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java =================================================================== ---- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2014-05-08 18:09:35.367796319 +0200 -+++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2014-05-08 18:18:01.703208309 +0200 -@@ -479,17 +479,17 @@ +--- 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 log(lvl, "trying: " + path); if (Settings.isWindows()) { log(lvl, "Running on Windows - checking system path!"); diff --git a/debian/patches/drop-useless-resources.patch b/debian/patches/drop-useless-resources.patch index ae068b8..e3da34b 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 -@@ -109,5 +109,13 @@ +@@ -115,5 +115,13 @@ </configuration> </plugin> </plugins> diff --git a/debian/patches/jruby-compat-1.9.patch b/debian/patches/jruby-compat-1.9.patch index ff42386..f1e7f70 100644 --- a/debian/patches/jruby-compat-1.9.patch +++ b/debian/patches/jruby-compat-1.9.patch @@ -3,9 +3,9 @@ Description: Force Ruby 1.9 compatibility Author: Gilles Filippini <[email protected]> Index: sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java =================================================================== ---- sikuli.orig/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java 2014-05-05 19:49:15.456850468 +0200 -+++ sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java 2014-05-10 13:27:05.416243313 +0200 -@@ -440,7 +440,7 @@ +--- sikuli.orig/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java ++++ sikuli/JRuby/src/main/java/org/sikuli/scriptrunner/JRubyScriptRunner.java +@@ -441,7 +441,7 @@ public class JRubyScriptRunner implement interpreter = new ScriptingContainer( LocalContextScope.THREADSAFE); diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch index 3b19aab..eb04538 100644 --- a/debian/patches/no-maven-repo-dependencies.patch +++ b/debian/patches/no-maven-repo-dependencies.patch @@ -1,9 +1,9 @@ Description: Add system scope for not yet mavenized dependencies Author: Gilles Filippini <[email protected]> -Index: sikuli-1.1.0~beta1/Jython/pom.xml +Index: sikuli/Jython/pom.xml =================================================================== ---- sikuli-1.1.0~beta1.orig/Jython/pom.xml 2014-05-05 17:28:24.000000000 +0000 -+++ sikuli-1.1.0~beta1/Jython/pom.xml 2014-05-10 09:13:04.501868695 +0000 +--- sikuli.orig/Jython/pom.xml ++++ sikuli/Jython/pom.xml @@ -41,6 +41,8 @@ <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> @@ -13,10 +13,10 @@ Index: sikuli-1.1.0~beta1/Jython/pom.xml </dependency> </dependencies> -Index: sikuli-1.1.0~beta1/IDE/pom.xml +Index: sikuli/IDE/pom.xml =================================================================== ---- sikuli-1.1.0~beta1.orig/IDE/pom.xml 2014-05-10 09:12:32.000000000 +0000 -+++ sikuli-1.1.0~beta1/IDE/pom.xml 2014-05-10 09:13:04.509868746 +0000 +--- sikuli.orig/IDE/pom.xml ++++ sikuli/IDE/pom.xml @@ -62,6 +62,8 @@ <groupId>com.explodingpixels</groupId> <artifactId>mac_widgets</artifactId> @@ -26,14 +26,14 @@ Index: sikuli-1.1.0~beta1/IDE/pom.xml </dependency> <dependency> <groupId>org.sikuli</groupId> -Index: sikuli-1.1.0~beta1/API/pom.xml +Index: sikuli/API/pom.xml =================================================================== ---- sikuli-1.1.0~beta1.orig/API/pom.xml 2014-05-10 09:13:04.509868746 +0000 -+++ sikuli-1.1.0~beta1/API/pom.xml 2014-05-10 09:20:58.016825706 +0000 +--- sikuli.orig/API/pom.xml ++++ sikuli/API/pom.xml @@ -37,6 +37,8 @@ <groupId>org.sikuli</groupId> <artifactId>OpenCV4SikuliX</artifactId> - <version>2.4.7</version> + <version>2.4.8</version> + <scope>system</scope> + <systemPath>/usr/share/java/opencv.jar</systemPath> </dependency> diff --git a/debian/patches/pom-removed-modules.patch b/debian/patches/pom-removed-modules.patch index 169ea76..cb7ae8f 100644 --- a/debian/patches/pom-removed-modules.patch +++ b/debian/patches/pom-removed-modules.patch @@ -1,10 +1,10 @@ Description: De-activate useless modules from parent pom file Author: Gilles Filippini <[email protected]> -Index: sikuli-1.1.0~beta1/pom.xml +Index: sikuli/pom.xml =================================================================== ---- sikuli-1.1.0~beta1.orig/pom.xml 2014-05-09 12:56:45.758974512 +0000 -+++ sikuli-1.1.0~beta1/pom.xml 2014-05-09 12:57:31.991252533 +0000 -@@ -219,22 +219,13 @@ +--- sikuli.orig/pom.xml ++++ sikuli/pom.xml +@@ -232,22 +232,13 @@ <modules> <module>Jygments4SikuliX</module> -- 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
