[sikuli] 01/06: Classpath: replace deprecated libconstantine-java.jar with jnr-constants.jar
Gilles Filippini
pini at debian.org
Sat May 23 09:27:31 UTC 2015
This is an automated email from the git hooks/post-receive script.
pini pushed a commit to branch 1.0_x_rc3
in repository sikuli.
commit d6646e97cc52f55b6aa106245392dfb654a3d7ef
Author: Gilles Filippini <pini at debian.org>
Date: Sat May 23 09:43:39 2015 +0200
Classpath: replace deprecated libconstantine-java.jar with jnr-constants.jar
Thanks to Chad Miller; fix 785720.
---
debian/changelog | 10 +++++
debian/patches/executable-wrappers.patch | 66 ++++++++++++++++++++++------
debian/patches/setTextAndMnemonic.patch | 74 ++++++++++++++++----------------
3 files changed, 99 insertions(+), 51 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a37fe54..a082fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sikuli (1.0~x~rc3.tesseract3-dfsg1-9) UNRELEASED; urgency=medium
+
+ * Fix executable-wrappers.patch (thanks to Chad Miller):
+ - split wrappers' args across lines to improve readability
+ - replace deprecated libconstantine-java.jar with jnr-constants.jar
+ (closes: #785720)
+ * Update patch setTextAndMnemonic.patch accordingly
+
+ -- Gilles Filippini <pini at debian.org> Sat, 23 May 2015 09:25:23 +0200
+
sikuli (1.0~x~rc3.tesseract3-dfsg1-8) unstable; urgency=medium
* Update patch use-java-libs-from-debian.patch to use the new jar name
diff --git a/debian/patches/executable-wrappers.patch b/debian/patches/executable-wrappers.patch
index 2e2cacc..62d30b5 100644
--- a/debian/patches/executable-wrappers.patch
+++ b/debian/patches/executable-wrappers.patch
@@ -3,24 +3,64 @@ Description: Fix executable wrapper scripts
the installation on Debian.
Since we don't embed external libs we have to set classpath, python path
and jni path accordingly.
- libconstantine-java isn't explicitly required but sikuli-script fails with:
- ImportError: cannot import name newString
- when it is missing.
Author: Gilles Filippini <pini at debian.org>
-Index: sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
===================================================================
---- sikuli-1.0~x~rc3.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-07-13 17:45:14.000000000 +0200
-+++ sikuli-1.0~x~rc3/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-07-13 17:45:33.000000000 +0200
-@@ -1,3 +1,2 @@
+--- sikuli.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
++++ sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+@@ -1,3 +1,30 @@
#!/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/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/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:/us [...]
-Index: sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh
++LC_NUMERIC=C exec /usr/bin/java \
++ -cp \
++/usr/share/java/guava.jar:\
++/usr/share/java/jnr-posix.jar:\
++/usr/share/java/jaffl.jar:\
++/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/jnr-constants.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-1.0~x~rc3.orig/sikuli-script/target/sikuli-script.sh 2013-07-13 17:45:14.000000000 +0200
-+++ sikuli-1.0~x~rc3/sikuli-script/target/sikuli-script.sh 2013-07-13 17:45:14.000000000 +0200
-@@ -1,2 +1,2 @@
+--- sikuli.orig/sikuli-script/target/sikuli-script.sh
++++ sikuli/sikuli-script/target/sikuli-script.sh
+@@ -1,2 +1,17 @@
#!/bin/sh
-java -jar sikuli-script.jar $@
-+exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/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/sikuli-script.jar" -Dfile.encoding=UTF-8 -Dpython.home=/usr/share/jython -Dpython.path="/usr/share/sikuli/Lib" -Dpython.cachedir=$HOME/.jython-cache org.sikuli.script.SikuliScript "$@"
++exec /usr/bin/java
++ -cp \
++/usr/share/java/guava.jar:\
++/usr/share/java/jnr-posix.jar:\
++/usr/share/java/jaffl.jar:\
++/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/jython.jar:\
++/usr/share/java/sikuli-script.jar \
++ -Dfile.encoding=UTF-8 \
++ -Dpython.home=/usr/share/jython \
++ -Dpython.path="/usr/share/sikuli/Lib" \
++ -Dpython.cachedir=$HOME/.jython-cache \
++ org.sikuli.script.SikuliScript "$@"
diff --git a/debian/patches/setTextAndMnemonic.patch b/debian/patches/setTextAndMnemonic.patch
index 728a319..b95e0cb 100644
--- a/debian/patches/setTextAndMnemonic.patch
+++ b/debian/patches/setTextAndMnemonic.patch
@@ -2,34 +2,9 @@ Description: Fix deprecated DefaultComponentFactory#setTextAndMnemonic
Replace the deprecated method with MnemonicUtils#configure.
Author: Gilles Filippini <pini at debian.org>
Bug-Debian: http://bugs.debian.org/711310
-Index: sikuli/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java
-===================================================================
---- sikuli.orig/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java 2013-06-07 08:02:38.000000000 +0200
-+++ sikuli/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java 2013-06-07 08:02:38.000000000 +0200
-@@ -33,6 +33,7 @@
- import javax.swing.event.ChangeEvent;
- import javax.swing.event.ChangeListener;
- import com.jgoodies.forms.factories.DefaultComponentFactory;
-+import com.jgoodies.common.swing.MnemonicUtils;
- import org.jdesktop.layout.*;
-
- import org.sikuli.script.Debug;
-@@ -496,8 +497,8 @@
-
- private void initComponentsI18n() {
- // JFormDesigner - Component i18n initialization - DO NOT MODIFY //GEN-BEGIN:initI18n
-- DefaultComponentFactory.setTextAndMnemonic(_titleAppearance, I18N._I("PreferencesWin.titleAppearance.textWithMnemonic"));
-- DefaultComponentFactory.setTextAndMnemonic(_titleIndentation, I18N._I("PreferencesWin.titleIndentation.textWithMnemonic"));
-+ MnemonicUtils.configure(_titleAppearance, I18N._I("PreferencesWin.titleAppearance.textWithMnemonic"));
-+ MnemonicUtils.configure(_titleIndentation, I18N._I("PreferencesWin.titleIndentation.textWithMnemonic"));
- _lblHotkey.setText(I18N._I("prefCaptureHotkey"));
- _lblDelay.setText(I18N._I("prefCaptureDelay"));
- _lblDelaySecs.setText(I18N._I("prefSeconds"));
-Index: sikuli/sikuli-ide/CMakeLists.txt
-===================================================================
---- sikuli.orig/sikuli-ide/CMakeLists.txt 2013-06-07 08:02:38.000000000 +0200
-+++ sikuli/sikuli-ide/CMakeLists.txt 2013-06-07 08:02:38.000000000 +0200
-@@ -48,6 +48,7 @@
+--- a/sikuli-ide/CMakeLists.txt
++++ b/sikuli-ide/CMakeLists.txt
+@@ -48,6 +48,7 @@ SET(JSON_SIMPLE_JAR "/usr/share/java/jso
SET(SWINGX_JAR "/usr/share/java/swingx-core.jar")
SET(MAC_WIDGETS_JAR "/usr/share/java/mac_widgets.jar")
SET(FORMS_JAR "/usr/share/java/forms.jar")
@@ -37,7 +12,7 @@ Index: sikuli/sikuli-ide/CMakeLists.txt
FILE(MAKE_DIRECTORY ${BINARY_DIR})
-@@ -79,7 +80,7 @@
+@@ -79,7 +80,7 @@ ENDIF()
SET(ARGS "")
SET(CLASSPATH
@@ -46,7 +21,7 @@ Index: sikuli/sikuli-ide/CMakeLists.txt
)
SET(JAR_FILE sikuli-ide.jar)
-@@ -141,6 +142,7 @@
+@@ -141,6 +142,7 @@ SET(INCLUDE_JARS ${SIKULI_SCRIPT_JAR} ${
${SWING_LAYOUT_JAR} ${COMMONS_CLI_JAR}
${BINARY_DIR}/${JAR_FILE} ${JSON_SIMPLE_JAR}
${SWINGX_JAR} ${MAC_WIDGETS_JAR} ${FORMS_JAR}
@@ -54,11 +29,34 @@ Index: sikuli/sikuli-ide/CMakeLists.txt
)
## Windows Package
-Index: sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
-===================================================================
---- sikuli.orig/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-06-07 08:02:38.000000000 +0200
-+++ sikuli/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh 2013-06-07 08:03:30.000000000 +0200
-@@ -1,2 +1,2 @@
- #!/bin/sh
--LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/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:/us [...]
-+LC_NUMERIC=C exec /usr/bin/java -cp "/usr/share/java/guava.jar:/usr/share/java/jnr-posix.jar:/usr/share/java/jaffl.jar:/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:/us [...]
+--- a/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java
++++ b/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java
+@@ -33,6 +33,7 @@ import javax.swing.border.EmptyBorder;
+ import javax.swing.event.ChangeEvent;
+ import javax.swing.event.ChangeListener;
+ import com.jgoodies.forms.factories.DefaultComponentFactory;
++import com.jgoodies.common.swing.MnemonicUtils;
+ import org.jdesktop.layout.*;
+
+ import org.sikuli.script.Debug;
+@@ -496,8 +497,8 @@ public class PreferencesWin extends JFra
+
+ private void initComponentsI18n() {
+ // JFormDesigner - Component i18n initialization - DO NOT MODIFY //GEN-BEGIN:initI18n
+- DefaultComponentFactory.setTextAndMnemonic(_titleAppearance, I18N._I("PreferencesWin.titleAppearance.textWithMnemonic"));
+- DefaultComponentFactory.setTextAndMnemonic(_titleIndentation, I18N._I("PreferencesWin.titleIndentation.textWithMnemonic"));
++ MnemonicUtils.configure(_titleAppearance, I18N._I("PreferencesWin.titleAppearance.textWithMnemonic"));
++ MnemonicUtils.configure(_titleIndentation, I18N._I("PreferencesWin.titleIndentation.textWithMnemonic"));
+ _lblHotkey.setText(I18N._I("prefCaptureHotkey"));
+ _lblDelay.setText(I18N._I("prefCaptureDelay"));
+ _lblDelaySecs.setText(I18N._I("prefSeconds"));
+--- a/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
++++ b/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh
+@@ -15,6 +15,7 @@ LC_NUMERIC=C exec /usr/bin/java
+ /usr/share/java/json-simple.jar:\
+ /usr/share/java/swing-layout.jar:\
+ /usr/share/java/swingx-core.jar:\
++/usr/share/java/jgoodies-common.jar:\
+ /usr/share/java/forms.jar:\
+ /usr/share/java/mac_widgets.jar:\
+ /usr/share/java/junit.jar:\
--
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