Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: pu
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi,
Please consider accepting this pu which fixes RC bug #714393 in sikuli-ide.
It also fixes an ugly typo reported in short description (#682011).
Debdiff attached.
Many thanks in advance,
_g.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAEBCAAGBQJR00LKAAoJEO/obGx//s+DAY4H/04hRK8dEiNxENm4yOto5q/k
HRpYrU0cFbfDeedXIOqf4aF8+iRsa/qb2DRTcuzZXh8n0VcFGpNdB+lZR2kiRLU7
n3g44VNwVFtICEsiSlR76WLyz7qfpHTapS4Mbx8Pv48NxCh5gz+k6qtcloiDuoni
i1YrwSzvnJCiLQ+A897028JrSwsh7qgyLm1qQoNnHmT4i4ALEXeaxKam7ffbomII
m3l5bT+bOvi1bF3HSxSsLDn6b0c+eYmLaRvVj3sfewC2q8dB8/2Ci6pOZ5ckH6hq
mCzNmw8j/q0ke4p6O/6Mh1bXwcBM2YwN1TeDOXvgB6cJLh2VNGYpkMWSY+Nv2hg=
=VqY7
-----END PGP SIGNATURE-----
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-02 23:03:23.000000000 +0200
@@ -1,3 +1,15 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-5+deb7u1) stable-proposed-updates; urgency=low
+
+ [tony mancill <tmanc...@debian.org>]
+ * fix typo in d/control (Closes: #682011)
+
+ [Gilles Filippini <p...@debian.org>]
+ * Updated patch:
+ + executable-wrappers.patch: add /usr/lib/<multiarch-triplet>/jni to
+ LD_LIBRARY_PATH (closes: #714393)
+
+ -- Gilles Filippini <p...@debian.org> Tue, 02 Jul 2013 21:48:40 +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-02 22:54:40.000000000 +0200
@@ -14,7 +14,7 @@
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
+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-02 22:54:40.000000000 +0200
@@ -9,17 +9,17 @@
Author: Gilles Filippini <p...@debian.org>
Index: sikuli/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.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-06-07 07:56:00.000000000 +0200
++++ sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-06-07 08:00:40.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 "$@"
++LD_LIBRARY_PATH=/usr/lib/@DEB_HOST_MULTIARCH@/jni:$LD_LIBRARY_PATH 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
===================================================================
---- 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.orig/sikuli-script/target/sikuli-script.sh 2013-06-07 07:56:00.000000000 +0200
++++ sikuli/sikuli-script/target/sikuli-script.sh 2013-06-07 07:56:00.000000000 +0200
@@ -1,2 +1,2 @@
#!/bin/sh
-java -jar sikuli-script.jar $@
diff -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/rules sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/rules
--- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/rules 2013-07-02 22:29:53.000000000 +0200
+++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/rules 2013-07-02 22:54:40.000000000 +0200
@@ -50,5 +50,6 @@
mkdir -p debian/sikuli-ide/usr/bin
install sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh debian/sikuli-ide/usr/bin/sikuli-ide
+ sed -i "s/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/" debian/sikuli-ide/usr/bin/sikuli-ide
dh_install
