This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit dd2aa6d20adacdeaecd8106c0c0eeace0209566e Author: Gilles Filippini <[email protected]> Date: Tue May 6 19:45:31 2014 +0200 Refresh easy patches and deactivate others --- debian/patches/basics-exclude-windows-mac.patch | 6 ++-- debian/patches/install-extension.patch | 6 ++-- debian/patches/native.patch | 46 ++++++++++++------------- debian/patches/series | 18 +++++----- debian/patches/setTextAndMnemonic.patch | 16 ++++----- debian/patches/tess3.patch | 4 +-- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/debian/patches/basics-exclude-windows-mac.patch b/debian/patches/basics-exclude-windows-mac.patch index b953a8d..8ce364e 100644 --- a/debian/patches/basics-exclude-windows-mac.patch +++ b/debian/patches/basics-exclude-windows-mac.patch @@ -2,10 +2,10 @@ Description: Exclude Windows and Mac specific source file from the build. WindowsHotkeyManager.java fails to compile on Linux because it relies on Windows specific library com.melloware.jintellitype. Author: Gilles Filippini <pini@debian> -Index: sikuli/basics/pom.xml +Index: sikuli/Basics/pom.xml =================================================================== ---- sikuli.orig/basics/pom.xml 2013-11-03 21:25:32.000000000 +0100 -+++ sikuli/basics/pom.xml 2013-11-03 21:25:32.000000000 +0100 +--- sikuli.orig/Basics/pom.xml 2013-11-03 21:25:32.000000000 +0100 ++++ sikuli/Basics/pom.xml 2013-11-03 21:25:32.000000000 +0100 @@ -123,6 +123,12 @@ <source>1.6</source> <target>1.6</target> diff --git a/debian/patches/install-extension.patch b/debian/patches/install-extension.patch index 55523ee..e97e3a7 100644 --- a/debian/patches/install-extension.patch +++ b/debian/patches/install-extension.patch @@ -1,10 +1,10 @@ Description: Fix extensions installation in user space Patch introduced for release 1.0~x~rc2. Forgot what the rationals are. Author: Gilles Filippini <[email protected]> -Index: sikuli/basics/src/main/java/org/sikuli/basics/ExtensionManager.java +Index: sikuli/Basics/src/main/java/org/sikuli/basics/ExtensionManager.java =================================================================== ---- sikuli.orig/basics/src/main/java/org/sikuli/basics/ExtensionManager.java 2013-10-19 16:33:08.000000000 +0200 -+++ sikuli/basics/src/main/java/org/sikuli/basics/ExtensionManager.java 2013-10-19 16:55:19.000000000 +0200 +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ExtensionManager.java 2013-10-19 16:33:08.000000000 +0200 ++++ sikuli/Basics/src/main/java/org/sikuli/basics/ExtensionManager.java 2013-10-19 16:55:19.000000000 +0200 @@ -60,12 +60,16 @@ if (targetFile.exists()) { targetFile.delete(); diff --git a/debian/patches/native.patch b/debian/patches/native.patch index 5a68f7b..eb1f74d 100644 --- a/debian/patches/native.patch +++ b/debian/patches/native.patch @@ -4,37 +4,37 @@ Description: Use System's native library loader libraries are shipped in their own binary package and we use the standard native library loader. Author: Gilles Filippini <[email protected]> -Index: sikuli/api/src/main/java/org/sikuli/script/Finder.java +Index: sikuli/API/src/main/java/org/sikuli/script/Finder.java =================================================================== ---- sikuli.orig/api/src/main/java/org/sikuli/script/Finder.java 2013-10-22 13:45:45.000000000 +0200 -+++ sikuli/api/src/main/java/org/sikuli/script/Finder.java 2013-10-22 13:45:45.000000000 +0200 -@@ -31,7 +31,7 @@ +--- sikuli.orig/API/src/main/java/org/sikuli/script/Finder.java 2014-05-06 07:44:35.837778333 +0200 ++++ sikuli/API/src/main/java/org/sikuli/script/Finder.java 2014-05-06 07:44:35.697777456 +0200 +@@ -36,7 +36,7 @@ + private boolean repeating = false; - //TODO Vision.setParameter("GPU", 1); static { - FileManager.loadLibrary("VisionProxy"); + System.loadLibrary("VisionProxy"); } /** -Index: sikuli/api/src/main/java/org/sikuli/script/TextRecognizer.java +Index: sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java =================================================================== ---- sikuli.orig/api/src/main/java/org/sikuli/script/TextRecognizer.java 2013-10-22 13:45:45.000000000 +0200 -+++ sikuli/api/src/main/java/org/sikuli/script/TextRecognizer.java 2013-10-22 13:45:45.000000000 +0200 -@@ -25,7 +25,7 @@ - protected static TextRecognizer _instance = null; +--- sikuli.orig/API/src/main/java/org/sikuli/script/TextRecognizer.java 2014-05-06 07:44:35.837778333 +0200 ++++ sikuli/API/src/main/java/org/sikuli/script/TextRecognizer.java 2014-05-06 07:44:35.701777481 +0200 +@@ -29,7 +29,7 @@ + private static boolean _init_succeeded = false; static { - FileManager.loadLibrary("VisionProxy"); + System.loadLibrary("VisionProxy"); } - protected TextRecognizer() { -Index: sikuli/basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java + private TextRecognizer() { +Index: sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java =================================================================== ---- sikuli.orig/basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java 2013-10-22 13:45:45.000000000 +0200 -+++ sikuli/basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java 2013-10-22 13:45:45.000000000 +0200 -@@ -17,7 +17,7 @@ +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java 2014-05-06 07:44:35.837778333 +0200 ++++ sikuli/Basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java 2014-05-06 07:44:35.705777506 +0200 +@@ -12,7 +12,7 @@ public class LinuxHotkeyManager extends HotkeyManager { static{ @@ -43,10 +43,10 @@ Index: sikuli/basics/src/main/java/org/sikuli/basics/LinuxHotkeyManager.java } class HotkeyData { -Index: sikuli/basics/src/main/java/org/sikuli/basics/VDictProxy.java +Index: sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java =================================================================== ---- sikuli.orig/basics/src/main/java/org/sikuli/basics/VDictProxy.java 2013-10-22 13:45:45.000000000 +0200 -+++ sikuli/basics/src/main/java/org/sikuli/basics/VDictProxy.java 2013-10-22 13:45:45.000000000 +0200 +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/VDictProxy.java 2014-05-06 07:44:35.837778333 +0200 ++++ sikuli/Basics/src/main/java/org/sikuli/basics/VDictProxy.java 2014-05-06 07:44:35.705777506 +0200 @@ -18,7 +18,7 @@ private Map<Integer, T> _i2obj = new HashMap<Integer, T>(); @@ -56,14 +56,14 @@ Index: sikuli/basics/src/main/java/org/sikuli/basics/VDictProxy.java } public VDictProxy(){ -Index: sikuli/basics/src/main/java/org/sikuli/basics/ResourceLoader.java +Index: sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java =================================================================== ---- sikuli.orig/basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2013-10-22 13:45:45.000000000 +0200 -+++ sikuli/basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2013-10-22 13:47:07.000000000 +0200 -@@ -133,6 +133,9 @@ - @Override +--- sikuli.orig/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2014-05-06 07:44:35.837778333 +0200 ++++ sikuli/Basics/src/main/java/org/sikuli/basics/ResourceLoader.java 2014-05-06 07:44:35.709777531 +0200 +@@ -149,6 +149,9 @@ public void check(String what) { mem = "check"; + + if (what.equals(Settings.SIKULI_LIB)) { + return; + } diff --git a/debian/patches/series b/debian/patches/series index 45e63ee..8b15dea 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,15 +1,15 @@ native.patch install-extension.patch -tess3.patch +#tess3.patch # This patch isn't needed currently. See patch Description # no-opencv-surf-module.patch setTextAndMnemonic.patch -printhelp.patch +# printhelp.patch -autotoolize-vision-proxy.patch -parent-pom.patch -add-classpath.patch -preserve-source-utf-8.patch -basics-exclude-windows-mac.patch -no-maven-repo-dependencies.patch -resources-out-of-jar.patch +#autotoolize-vision-proxy.patch +#parent-pom.patch +#add-classpath.patch +#preserve-source-utf-8.patch +#basics-exclude-windows-mac.patch +#no-maven-repo-dependencies.patch +#resources-out-of-jar.patch diff --git a/debian/patches/setTextAndMnemonic.patch b/debian/patches/setTextAndMnemonic.patch index 85a9d07..0f7ad2c 100644 --- a/debian/patches/setTextAndMnemonic.patch +++ b/debian/patches/setTextAndMnemonic.patch @@ -2,10 +2,10 @@ Description: Fix deprecated DefaultComponentFactory#setTextAndMnemonic Replace the deprecated method with MnemonicUtils#configure. Author: Gilles Filippini <[email protected]> Bug-Debian: http://bugs.debian.org/711310 -Index: sikuli/ide/src/main/java/org/sikuli/ide/PreferencesWin.java +Index: sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java =================================================================== ---- sikuli.orig/ide/src/main/java/org/sikuli/ide/PreferencesWin.java 2013-10-19 15:26:22.000000000 +0200 -+++ sikuli/ide/src/main/java/org/sikuli/ide/PreferencesWin.java 2013-10-19 15:26:22.000000000 +0200 +--- sikuli.orig/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java 2014-05-06 08:10:35.295565662 +0200 ++++ sikuli/IDE/src/main/java/org/sikuli/ide/PreferencesWin.java 2014-05-06 08:10:35.287565612 +0200 @@ -8,6 +8,7 @@ import org.sikuli.basics.PreferencesUser; @@ -14,7 +14,7 @@ Index: sikuli/ide/src/main/java/org/sikuli/ide/PreferencesWin.java import java.awt.*; import java.awt.event.*; import java.util.Arrays; -@@ -414,8 +415,8 @@ +@@ -420,8 +421,8 @@ private void initComponentsI18n() { // JFormDesigner - Component i18n initialization - DO NOT MODIFY //GEN-BEGIN:initI18n @@ -25,11 +25,11 @@ Index: sikuli/ide/src/main/java/org/sikuli/ide/PreferencesWin.java _lblHotkey.setText(SikuliIDEI18N._I("prefCaptureHotkey")); _lblDelay.setText(SikuliIDEI18N._I("prefCaptureDelay")); _lblDelaySecs.setText(SikuliIDEI18N._I("prefSeconds")); -Index: sikuli/ide/pom.xml +Index: sikuli/IDE/pom.xml =================================================================== ---- sikuli.orig/ide/pom.xml 2013-10-19 15:26:22.000000000 +0200 -+++ sikuli/ide/pom.xml 2013-10-19 15:26:22.000000000 +0200 -@@ -124,6 +124,11 @@ +--- sikuli.orig/IDE/pom.xml 2014-05-06 08:10:35.295565662 +0200 ++++ sikuli/IDE/pom.xml 2014-05-06 08:10:35.287565612 +0200 +@@ -54,6 +54,11 @@ <version>1.2.1</version> </dependency> <dependency> diff --git a/debian/patches/tess3.patch b/debian/patches/tess3.patch index 1bd27b4..41d88a5 100644 --- a/debian/patches/tess3.patch +++ b/debian/patches/tess3.patch @@ -4,8 +4,8 @@ Description: Tesseract 3.02 support Author: Gilles Filippini <[email protected]> Index: sikuli/vision-proxy/src/tessocr.cpp =================================================================== ---- sikuli.orig/vision-proxy/src/tessocr.cpp 2013-10-19 16:09:02.000000000 +0200 -+++ sikuli/vision-proxy/src/tessocr.cpp 2013-10-19 16:09:52.000000000 +0200 +--- sikuli.orig/Natives/src/main/native/Vision/tessocr.cpp 2013-10-19 16:09:02.000000000 +0200 ++++ sikuli/Natives/src/main/native/Vision/tessocr.cpp 2013-10-19 16:09:52.000000000 +0200 @@ -404,7 +404,7 @@ //we have to use setenv instead. setenv("TESSDATA_PREFIX", datapath, 1); -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/sikuli.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
