[sikuli] 01/01: Upload release 1.1.0-2 to unstable

Gilles Filippini pini at debian.org
Mon Nov 28 22:55:23 UTC 2016


This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository sikuli.

commit eafe5b81df588ee44f1543e2caad67e3918ab633
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Nov 28 23:30:06 2016 +0100

    Upload release 1.1.0-2 to unstable
    
    Use jarwrapper.
---
 debian/changelog                                | 15 ++++++++
 debian/control                                  | 10 +++---
 debian/maven.rules                              |  3 ++
 debian/maven.rules.ours                         |  3 ++
 debian/patches/debian-java-parameters.patch     | 12 +++++++
 debian/patches/dependency-opencv.patch          | 10 ++++++
 debian/patches/jython-sikulix-module-path.patch | 26 ++++++++++++++
 debian/patches/no-maven-repo-dependencies.patch | 46 +++++++++++++++++++++++--
 debian/patches/series                           |  2 ++
 debian/rules                                    |  1 +
 debian/sikulix.install                          |  1 -
 debian/sikulix.links                            |  1 +
 debian/wrappers/sikulix                         | 22 ------------
 13 files changed, 120 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 480c773..21eb325 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+sikulix (1.1.0-2) unstable; urgency=medium
+
+  * Improve no-maven-repo-dependencies.patch and dependency-opencv.patch,
+    and add new patches jython-sikulix-module-path.patch and
+    debian-java-parameters.patch so that sikulix can be launched using
+    jarwrapper
+  * debian/control:
+    - Depends: jarwrapper
+    - Versioned Depends: jython (>= 2.5.3-12) to have #845270 and #845360
+      fixed
+    - Fix Vcs-Browser field
+    - Bump Standards-Version to 3.9.8 (no changes)
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 28 Nov 2016 23:29:17 +0100
+
 sikulix (1.1.0-1) unstable; urgency=medium
 
   * New patch opencv-3.1.patch to cope with opencv-3.1 transition
diff --git a/debian/control b/debian/control
index 4a9a0bb..31dece2 100644
--- a/debian/control
+++ b/debian/control
@@ -18,17 +18,17 @@ Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.7)
 # No doc package exist for: libbsh-java, libcommons-cli-java, jruby
 # No need for: junit4-doc
  , default-jdk-doc, jython-doc, libswing-layout-java-doc, libjavassist-java-doc, libjxgrabkey-doc
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Homepage: http://www.sikulix.com
 Vcs-Git: git://anonscm.debian.org/pkg-java/sikuli.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/sikuli.git;a=summary
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/sikuli.git/
 
 Package: sikulix
 Architecture: all
 Replaces: sikuli-ide (<< 1.1.0~)
 Breaks: sikuli-ide (<< 1.1.0~)
 Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-java (= ${binary:Version}), libmac-widgets-java
- , libjxgrabkey-java
+ , libjxgrabkey-java, jarwrapper
 Description: IDE to develop SikuliX scripts
  SikuliX mixes image recognition into Jython or JRuby scripting to automate
  interactions with graphical user interfaces.
@@ -43,11 +43,9 @@ Package: libsikulixapi-java
 Architecture: all
 Replaces: libsikuli-script-java (<< 1.1.0~)
 Breaks: libsikuli-script-java (<< 1.1.0~)
-Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython, wmctrl, xdotool, tesseract-ocr-eng
+Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython (>= 2.5.3-12), wmctrl, xdotool, tesseract-ocr-eng
 # These ones miss maven integration
  , libcommons-exec-java, libopencv2.4-java
-# Hard coded because of #796933
- , antlr3.2
 # The script sikuli2html.py needs python
  , python
 # RunTime.java needs commands lsb-release and killall
diff --git a/debian/maven.rules b/debian/maven.rules
index baed0c8..f746f48 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -6,3 +6,6 @@ s/org\.javassist/javassist/ javassist jar s/.*/debian/ * *
 org.jruby jruby-complete jar s/.*/debian/ * *
 s/org\.swinglabs\.swingx/org.swinglabs/ s/swingx-.*/swingx-core/ jar s/1\..*/1.x/ * *
 junit junit jar s/4\..*/4.x/ * *
+asm * jar s/3\..*/3.x/ * *
+# Because #796933
+org.antlr antlr-runtime jar 3.2 * *
diff --git a/debian/maven.rules.ours b/debian/maven.rules.ours
index baed0c8..f746f48 100644
--- a/debian/maven.rules.ours
+++ b/debian/maven.rules.ours
@@ -6,3 +6,6 @@ s/org\.javassist/javassist/ javassist jar s/.*/debian/ * *
 org.jruby jruby-complete jar s/.*/debian/ * *
 s/org\.swinglabs\.swingx/org.swinglabs/ s/swingx-.*/swingx-core/ jar s/1\..*/1.x/ * *
 junit junit jar s/4\..*/4.x/ * *
+asm * jar s/3\..*/3.x/ * *
+# Because #796933
+org.antlr antlr-runtime jar 3.2 * *
diff --git a/debian/patches/debian-java-parameters.patch b/debian/patches/debian-java-parameters.patch
new file mode 100644
index 0000000..6dcdf77
--- /dev/null
+++ b/debian/patches/debian-java-parameters.patch
@@ -0,0 +1,12 @@
+Index: sikuli/IDE/pom.xml
+===================================================================
+--- sikuli.orig/IDE/pom.xml
++++ sikuli/IDE/pom.xml
+@@ -172,6 +172,7 @@
+             </manifest>
+             <manifestEntries>
+               <Class-Path>/usr/share/java/mac_widgets.jar /usr/share/java/jython.jar /usr/share/java/opencv.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>
+         </configuration>
diff --git a/debian/patches/dependency-opencv.patch b/debian/patches/dependency-opencv.patch
index db63cfa..e768ac9 100644
--- a/debian/patches/dependency-opencv.patch
+++ b/debian/patches/dependency-opencv.patch
@@ -18,3 +18,13 @@ Index: sikuli/API/pom.xml
  			<!-- BridJ aims to be the ultimate Java / native interoperability library
  			Call C, C++, ObjectiveC libraries without compiling native code
  			https://code.google.com/p/bridj/ -->
+@@ -107,6 +114,9 @@
+ 						<manifest>
+ 							<mainClass>org.sikuli.script.Sikulix</mainClass>
+ 						</manifest>
++						<manifestEntries>
++							<Class-Path>/usr/share/java/opencv.jar</Class-Path>
++						</manifestEntries>
+ 					</archive>
+ 				</configuration>
+ 			</plugin>
diff --git a/debian/patches/jython-sikulix-module-path.patch b/debian/patches/jython-sikulix-module-path.patch
new file mode 100644
index 0000000..239538e
--- /dev/null
+++ b/debian/patches/jython-sikulix-module-path.patch
@@ -0,0 +1,26 @@
+Index: sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
+===================================================================
+--- sikuli.orig/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
++++ sikuli/IDE/src/main/java/org/sikuli/scriptrunner/JythonScriptRunner.java
+@@ -112,17 +112,10 @@ public class JythonScriptRunner implemen
+       getInterpreter();
+       helper = JythonHelper.set(interpreter);
+       helper.getSysPath();
+-      String fpAPI = null;
+-			String[] possibleJars = new String[] {"sikulixapi", "API/target/classes", "sikulix.jar"};
+-			for (String aJar : possibleJars) {
+-				if (null != (fpAPI = runTime.isOnClasspath(aJar))) {
+-					break;
+-				}
+-			}
+-			if (null == fpAPI) {
+-				runTime.terminate(1, "JythonScriptRunner: no sikulix....jar on classpath");
+-      }
+-      String fpAPILib = new File(fpAPI, "Lib").getAbsolutePath();
++      // Retreive Jython Sikulix module path (API jar file path + '/Lib')
++      File aJar = new File(org.sikuli.script.Sikulix.class.getProtectionDomain().getCodeSource().getLocation().toURI());
++      String fpAPI = aJar.getAbsolutePath();
++      String fpAPILib = (new File(fpAPI, "Lib")).getAbsolutePath();
+       helper.putSysPath(fpAPILib, 0);
+       helper.setSysPath();
+ 			helper.addSitePackages();
diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch
index 8cc4a3d..fb4fdfc 100644
--- a/debian/patches/no-maven-repo-dependencies.patch
+++ b/debian/patches/no-maven-repo-dependencies.patch
@@ -4,16 +4,46 @@ Index: sikuli/IDE/pom.xml
 ===================================================================
 --- sikuli.orig/IDE/pom.xml
 +++ sikuli/IDE/pom.xml
-@@ -37,6 +37,8 @@
+@@ -37,6 +37,38 @@
        <groupId>org.python</groupId>
        <artifactId>jython-standalone</artifactId>
        <version>${sikulixjythonversion}</version>
 +      <scope>system</scope>
 +      <systemPath>/usr/share/java/jython.jar</systemPath>
++    </dependency>
++    <dependency>
++      <groupId>com.google.guava</groupId>
++      <artifactId>guava</artifactId>
++      <version>19.0</version>
++      <scope>runtime</scope>
++    </dependency>
++    <dependency>
++      <groupId>org.antlr</groupId>
++      <artifactId>antlr-runtime</artifactId>
++      <version>3.2</version>
++      <scope>runtime</scope>
++    </dependency>
++    <dependency>
++      <groupId>asm</groupId>
++      <artifactId>asm</artifactId>
++      <version>3.3.2</version>
++      <scope>runtime</scope>
++    </dependency>
++    <dependency>
++      <groupId>asm</groupId>
++      <artifactId>asm-commons</artifactId>
++      <version>3.3.2</version>
++      <scope>runtime</scope>
++    </dependency>
++    <dependency>
++      <groupId>jline</groupId>
++      <artifactId>jline</artifactId>
++      <version>1.0</version>
++      <scope>runtime</scope>
      </dependency>
      <dependency>
        <groupId>org.jruby</groupId>
-@@ -48,11 +50,11 @@
+@@ -48,11 +80,11 @@
        <artifactId>json-simple</artifactId>
        <version>1.1.1</version>
      </dependency>
@@ -27,7 +57,7 @@ Index: sikuli/IDE/pom.xml
      <dependency>
        <groupId>org.kohsuke.metainf-services</groupId>
        <artifactId>metainf-services</artifactId>
-@@ -113,6 +115,8 @@
+@@ -113,6 +145,8 @@
        <groupId>com.explodingpixels</groupId>
        <artifactId>mac_widgets</artifactId>
        <version>0.9.5</version>
@@ -36,3 +66,13 @@ Index: sikuli/IDE/pom.xml
      </dependency>
      <dependency>
        <groupId>com.sikulix</groupId>
+@@ -136,6 +170,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>
++            </manifestEntries>
+           </archive>
+         </configuration>
+       </plugin>
diff --git a/debian/patches/series b/debian/patches/series
index 7ba934a..39c725a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,5 @@ dependency-opencv.patch
 no-vnc-package.patch
 fix-log-parameters-order.patch
 opencv-3.1.patch
+jython-sikulix-module-path.patch
+debian-java-parameters.patch
diff --git a/debian/rules b/debian/rules
index 0792b78..99de67f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,6 +60,7 @@ clean::
 # .substvars files.
 install/sikulix::
 	ln IDE/target/sikulix-1.1.0.jar IDE/target/sikulix.jar
+	chmod a+x IDE/target/sikulix.jar
 	cp debian/maven.ignoreRules.full debian/maven.ignoreRules
 	mh_resolve_dependencies --non-interactive --offline -psikulix  --base-directory=$(CURDIR) --non-explore
 
diff --git a/debian/sikulix.install b/debian/sikulix.install
index 976d81d..a08ca6c 100644
--- a/debian/sikulix.install
+++ b/debian/sikulix.install
@@ -1,2 +1 @@
 IDE/target/sikulix.jar usr/share/sikulix
-debian/wrappers/sikulix usr/bin
diff --git a/debian/sikulix.links b/debian/sikulix.links
new file mode 100644
index 0000000..01c3556
--- /dev/null
+++ b/debian/sikulix.links
@@ -0,0 +1 @@
+usr/share/sikulix/sikulix.jar usr/bin/sikulix
diff --git a/debian/wrappers/sikulix b/debian/wrappers/sikulix
deleted file mode 100755
index 9c368ab..0000000
--- a/debian/wrappers/sikulix
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-LC_NUMERIC=C exec /usr/bin/java -cp \
-/usr/share/java/mac_widgets.jar:\
-/usr/share/java/opencv.jar:\
-/usr/share/java/jython.jar:\
-/usr/share/java/guava.jar:\
-/usr/share/java/antlr3-runtime-3.2.jar:\
-/usr/share/java/asm3.jar:\
-/usr/share/java/asm3-commons.jar:\
-/usr/share/java/jline.jar:\
-/usr/share/java/sikulixapi.jar:\
-/usr/share/sikulix/sikulix.jar \
-\
--Dsikuli.console=true \
--Dsikuli.debug=0 \
--Xms64M \
--Xmx512M \
--Dfile.encoding=UTF-8 \
--Dpython.home=/usr/share/jython \
--Dpython.cachedir=$HOME/.jython-cache \
-\
-org.sikuli.ide.Sikulix "$@"

-- 
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