Gilles Filippini a écrit , Le 05/07/2013 10:47: > Well, another way to fix it would be to depend on default-jre only and > explicitly use its java binary (/usr/lib/jvm/default-java/bin/java) > instead of the one configured by update-alternatives. Would it be > acceptable? Please find attached the related debdiff. Thanks, _g.
diff -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/changelog sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/changelog
--- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/changelog 2013-07-02 22:29:52.000000000 +0200
+++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/changelog 2013-07-09 20:16:49.000000000 +0200
@@ -1,3 +1,14 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-5+deb7u1) stable-proposed-updates; urgency=low
+
+ [tony mancill <tmancill@debian.org>]
+ * fix typo in d/control (Closes: #682011)
+
+ [Gilles Filippini <pini@debian.org>]
+ * Depends on default-jre only and update patch executable-wrappers.patch
+ to force using the default-jre (closes: #714393)
+
+ -- Gilles Filippini <pini@debian.org> Tue, 09 Jul 2013 19:59:51 +0200
+
sikuli (1.0~x~rc3.tesseract3-dfsg1-5) unstable; urgency=low
* New patch no-opencv-surf-module.patch:
diff -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/control sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/control
--- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/control 2013-07-02 22:29:52.000000000 +0200
+++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/control 2013-07-09 20:03:43.000000000 +0200
@@ -13,8 +13,8 @@
Package: sikuli-ide
Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, default-jre (>= 1:1.6) | java6-runtime, libsikuli-script-java, junit, libswingx-java, libswing-layout-java
-Description: IDE to develop sikuli scripts and use them a junit test cases
+Depends: ${java:Depends}, ${misc:Depends}, default-jre (>= 1:1.6), libsikuli-script-java, junit, libswingx-java, libswing-layout-java
+Description: IDE to develop sikuli scripts and use them as junit test cases
Sikuli mixes image recognition into jython scripting to automate
interactions with graphical user interfaces.
.
diff -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/executable-wrappers.patch sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/executable-wrappers.patch
--- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/executable-wrappers.patch 2013-07-02 22:29:52.000000000 +0200
+++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/executable-wrappers.patch 2013-07-09 20:01:47.000000000 +0200
@@ -7,19 +7,19 @@
ImportError: cannot import name newString
when it is missing.
Author: Gilles Filippini <pini@debian.org>
-Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+Index: sikuli-stable/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
===================================================================
---- sikuli.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2011-09-26 22:14:12.000000000 +0200
-+++ sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2011-09-26 22:57:49.000000000 +0200
+--- sikuli-stable.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-07-09 20:00:47.000000000 +0200
++++ sikuli-stable/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-07-09 20:01:35.000000000 +0200
@@ -1,3 +1,2 @@
#!/bin/sh
-DIR=`dirname $0`
-LC_NUMERIC=C java -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -jar $DIR/sikuli-ide.jar $*
-+LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/junit.jar:/usr/share/sikuli/sikuli-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
-Index: sikuli/sikuli-script/target/sikuli-script.sh
++LC_NUMERIC=C exec /usr/lib/jvm/default-java/bin/java -cp "/usr/share/java/jna.jar:/usr/share/java/asm3.jar:/usr/share/java/asm3-commons.jar:/usr/share/java/antlr3-runtime.jar:/usr/share/java/libconstantine-java.jar:/usr/share/java/jython.jar:/usr/share/java/commons-cli.jar:/usr/share/java/JXGrabKey.jar:/usr/share/java/json_simple.jar:/usr/share/java/swing-layout.jar:/usr/share/java/swingx-core.jar:/usr/share/java/forms.jar:/usr/share/java/mac_widgets.jar:/usr/share/java/junit.jar:/usr/share/sikuli/sikuli-ide.jar:/usr/share/java/sikuli-script.jar" -Dsikuli.console=true -Dsikuli.debug=0 -Xms64M -Xmx512M -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.ide.SikuliIDE "$@"
+Index: sikuli-stable/sikuli-script/target/sikuli-script.sh
===================================================================
---- sikuli.orig/sikuli-script/target/sikuli-script.sh 2011-09-26 22:14:12.000000000 +0200
-+++ sikuli/sikuli-script/target/sikuli-script.sh 2011-09-26 22:59:31.000000000 +0200
+--- sikuli-stable.orig/sikuli-script/target/sikuli-script.sh 2013-07-09 20:00:47.000000000 +0200
++++ sikuli-stable/sikuli-script/target/sikuli-script.sh 2013-07-09 20:00:47.000000000 +0200
@@ -1,2 +1,2 @@
#!/bin/sh
-java -jar sikuli-script.jar $@
Attachment:
signature.asc
Description: OpenPGP digital signature