This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit a12dbbbeeb6a6ac6055de4d6c71b18e494ee21ab Author: Gilles Filippini <[email protected]> Date: Wed Nov 1 18:20:50 2017 +0100 Use jython maven integration --- debian/changelog | 1 + debian/maven.rules | 1 + debian/maven.rules.ours | 1 + debian/patches/debian-java-parameters.patch | 2 +- debian/patches/no-maven-repo-dependencies.patch | 24 +++++++++++------------- 5 files changed, 15 insertions(+), 14 deletions(-) diff --git a/debian/changelog b/debian/changelog index e117fcc..3c1dfb3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ sikulix (1.1.1-4) unstable; urgency=medium * Build-Depends: libopencv-dev (>= 3.3.0+dfsg-1~) to benefit from its maven integration and drop hardcoded dependency on libopencv3.2-java (closes: #877075) + * Benefit from the jython maven integration as well * Update patches accordingly -- Gilles Filippini <[email protected]> Mon, 30 Oct 2017 21:48:19 +0100 diff --git a/debian/maven.rules b/debian/maven.rules index 2086784..bf6ff06 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -10,4 +10,5 @@ s/asm/org.ow2.asm/ * jar s/3\..*/debian/ * * # Because #796933 org.antlr antlr-runtime jar 3.2 * * # +org.python s/jython-standalone/jython/ jar s/.*/debian/ * * com.sikulix * jar * * * diff --git a/debian/maven.rules.ours b/debian/maven.rules.ours index 2086784..bf6ff06 100644 --- a/debian/maven.rules.ours +++ b/debian/maven.rules.ours @@ -10,4 +10,5 @@ s/asm/org.ow2.asm/ * jar s/3\..*/debian/ * * # Because #796933 org.antlr antlr-runtime jar 3.2 * * # +org.python s/jython-standalone/jython/ jar s/.*/debian/ * * com.sikulix * jar * * * diff --git a/debian/patches/debian-java-parameters.patch b/debian/patches/debian-java-parameters.patch index 2bfaa1e..b250a2f 100644 --- a/debian/patches/debian-java-parameters.patch +++ b/debian/patches/debian-java-parameters.patch @@ -5,7 +5,7 @@ Index: sikuli/IDE/pom.xml @@ -176,6 +176,7 @@ </manifest> <manifestEntries> - <Class-Path>/usr/share/java/mac_widgets.jar /usr/share/java/jython.jar /usr/share/java/opencv.jar</Class-Path> + <Class-Path>/usr/share/java/mac_widgets.jar</Class-Path> + <Debian-Java-Parameters>-Dsikuli.console=true -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython</Debian-Java-Parameters> </manifestEntries> </archive> diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch index 800bced..4181226 100644 --- a/debian/patches/no-maven-repo-dependencies.patch +++ b/debian/patches/no-maven-repo-dependencies.patch @@ -4,14 +4,10 @@ Index: sikuli/IDE/pom.xml =================================================================== --- sikuli.orig/IDE/pom.xml +++ sikuli/IDE/pom.xml -@@ -41,6 +41,38 @@ - <groupId>org.python</groupId> - <artifactId>jython-standalone</artifactId> +@@ -43,6 +43,36 @@ <version>${sikulixjythonversion}</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/jython.jar</systemPath> -+ </dependency> -+ <dependency> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>19.0</version> @@ -40,10 +36,12 @@ Index: sikuli/IDE/pom.xml + <artifactId>jline</artifactId> + <version>1.0</version> + <scope>runtime</scope> - </dependency> - <dependency> ++ </dependency> ++ <dependency> <groupId>org.jruby</groupId> -@@ -52,11 +84,11 @@ + <artifactId>jruby-complete</artifactId> + <version>${sikulixjrubyversion}</version> +@@ -52,11 +82,11 @@ <artifactId>json-simple</artifactId> <version>1.1.1</version> </dependency> @@ -57,7 +55,7 @@ Index: sikuli/IDE/pom.xml <dependency> <groupId>org.kohsuke.metainf-services</groupId> <artifactId>metainf-services</artifactId> -@@ -117,6 +149,8 @@ +@@ -117,6 +147,8 @@ <groupId>com.explodingpixels</groupId> <artifactId>mac_widgets</artifactId> <version>0.9.5</version> @@ -66,12 +64,12 @@ Index: sikuli/IDE/pom.xml </dependency> <dependency> <groupId>com.sikulix</groupId> -@@ -140,6 +174,9 @@ +@@ -140,6 +172,9 @@ <manifest> <mainClass>org.sikuli.ide.Sikulix</mainClass> </manifest> + <manifestEntries> -+ <Class-Path>/usr/share/java/mac_widgets.jar /usr/share/java/jython.jar /usr/share/java/opencv.jar</Class-Path> ++ <Class-Path>/usr/share/java/mac_widgets.jar</Class-Path> + </manifestEntries> </archive> </configuration> -- 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
