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 2014-06-29 13:25:43.000000000 -0400 +++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/changelog 2015-05-19 11:35:42.000000000 -0400 @@ -1,3 +1,12 @@ +sikuli (1.0~x~rc3.tesseract3-dfsg1-8ubuntu1) UNRELEASED; urgency=medium + + * debian/patches/executable-wrappers.patch: Split wrappers' args across + lines to make patchable. + * debian/patches/any-constants-library.patch: Add another constants library + that may include functionality that a transitional package lacks. (Closes: #785720) + + -- Chad MILLER Tue, 19 May 2015 11:33:14 -0400 + 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 -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/any-constants-library.patch sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/any-constants-library.patch --- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/any-constants-library.patch 1969-12-31 19:00:00.000000000 -0500 +++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/any-constants-library.patch 2015-05-19 11:33:06.000000000 -0400 @@ -0,0 +1,25 @@ +Description: The "constants" library can vary, so the classpath should list the + ones we are likely to encounter. In contemporary Ubuntu, libconstantine-java is + empty transitional. +Author: Chad MILLER + +--- a/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh ++++ b/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh +@@ -9,6 +9,7 @@ LC_NUMERIC=C exec /usr/bin/java \ + /usr/share/java/asm3-commons.jar:\ + /usr/share/java/antlr3-runtime.jar:\ + /usr/share/java/libconstantine-java.jar:\ ++/usr/share/java/jnr-constants.jar:\ + /usr/share/java/jython.jar:\ + /usr/share/java/commons-cli.jar:\ + /usr/share/java/JXGrabKey.jar:\ +--- a/sikuli-script/target/sikuli-script.sh ++++ b/sikuli-script/target/sikuli-script.sh +@@ -9,6 +9,7 @@ exec /usr/bin/java \ + /usr/share/java/asm3-commons.jar:\ + /usr/share/java/antlr3-runtime.jar:\ + /usr/share/java/libconstantine-java.jar:\ ++/usr/share/java/jnr-constants.jar:\ + /usr/share/java/jython.jar:\ + /usr/share/java/sikuli-script.jar \ + -Dfile.encoding=UTF-8 \ 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 2014-06-29 11:41:46.000000000 -0400 +++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/executable-wrappers.patch 2015-05-19 11:24:43.000000000 -0400 @@ -7,20 +7,60 @@ ImportError: cannot import name newString when it is missing. Author: Gilles Filippini -Index: sikuli-1.0~x~rc3/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 @@ +--- a/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh ++++ b/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:/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-1.0~x~rc3/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 @@ ++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:\ ++/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 "$@" +--- a/sikuli-script/target/sikuli-script.sh ++++ b/sikuli-script/target/sikuli-script.sh +@@ -1,2 +1,18 @@ #!/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/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 "$@" diff -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/series sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/series --- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/series 2014-06-29 09:53:46.000000000 -0400 +++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/series 2015-05-19 11:29:33.000000000 -0400 @@ -8,3 +8,4 @@ gcc-4.7.patch no-opencv-surf-module.patch setTextAndMnemonic.patch +any-constants-library.patch diff -Nru sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/setTextAndMnemonic.patch sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/setTextAndMnemonic.patch --- sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/setTextAndMnemonic.patch 2014-06-29 11:44:27.000000000 -0400 +++ sikuli-1.0~x~rc3.tesseract3-dfsg1/debian/patches/setTextAndMnemonic.patch 2015-05-19 11:28:29.000000000 -0400 @@ -2,34 +2,9 @@ Replace the deprecated method with MnemonicUtils#configure. Author: Gilles Filippini 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 @@ FILE(MAKE_DIRECTORY ${BINARY_DIR}) -@@ -79,7 +80,7 @@ +@@ -79,7 +80,7 @@ ENDIF() SET(ARGS "") SET(CLASSPATH @@ -46,7 +21,7 @@ ) 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 @@ ) ## 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:/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 "$@" -+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:/usr/share/java/jgoodies-common.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 "$@" +--- 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:\