lp:~yolanda.robla/ubuntu/saucy/sikuli/debian_merge

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntu/saucy/sikuli at revision 15

Daniel Holbach (community): Approve on 2013-07-30

Diff: 11100 lines (+744/-9680)

55 files modified

.pc/applied-patches (+0/-10)
.pc/executable-wrappers.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh (+0/-3)
.pc/executable-wrappers.patch/sikuli-script/target/sikuli-script.sh (+0/-2)
.pc/fix-cmake-sikuli-ide.patch/sikuli-ide/CMakeLists.txt (+0/-403)
.pc/gcc-4.7.patch/sikuli-script/src/main/native/sikuli-debug.h (+0/-52)
.pc/install-extension.patch/sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java (+0/-175)
.pc/jgoodies-1.6-compat.patch/sikuli-ide/CMakeLists.txt (+0/-405)
.pc/jgoodies-1.6-compat.patch/sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java (+0/-561)
.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/Finder.java (+0/-195)
.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java (+0/-120)
.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java (+0/-118)
.pc/native.patch/sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java (+0/-106)
.pc/native.patch/sikuli-script/src/main/native/vision.i (+0/-264)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/cvgui.cpp (+0/-2508)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/cvgui.h (+0/-239)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/imgdb.cpp (+0/-311)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/imgdb.h (+0/-75)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/vision.cpp (+0/-506)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/vision.h (+0/-118)
.pc/no-opencv-surf-module.patch/sikuli-script/src/main/native/vision.i (+0/-264)
.pc/tess3.patch/cmake_modules/FindTesseract.cmake (+0/-47)
.pc/tess3.patch/sikuli-script/src/main/native/tessocr.cpp (+0/-984)
.pc/tessdata.patch/sikuli-script/CMakeLists.txt (+0/-297)
.pc/tessdata.patch/sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java (+0/-118)
.pc/tessdata.patch/sikuli-script/src/main/native/tessocr.cpp (+0/-983)
.pc/use-java-libs-from-debian.patch/sikuli-ide/CMakeLists.txt (+0/-404)
.pc/use-java-libs-from-debian.patch/sikuli-script/CMakeLists.txt (+0/-298)
cmake_modules/FindTesseract.cmake (+12/-3)
debian/changelog (+36/-0)
debian/control (+6/-6)
debian/patches/executable-wrappers.patch (+6/-6)
debian/patches/force-java6-target.patch (+30/-0)
debian/patches/jgoodies-1.6-compat.patch (+0/-40)
debian/patches/series (+2/-1)
debian/patches/setTextAndMnemonic.patch (+64/-0)
debian/rules (+1/-1)
sikuli-ide/CMakeLists.txt (+12/-14)
sikuli-ide/src/main/java/org/sikuli/ide/PreferencesWin.java (+2/-3)
sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh (+2/-1)
sikuli-script/CMakeLists.txt (+17/-16)
sikuli-script/src/main/java/org/sikuli/script/ExtensionManager.java (+2/-3)
sikuli-script/src/main/java/org/sikuli/script/Finder.java (+4/-2)
sikuli-script/src/main/java/org/sikuli/script/TextRecognizer.java (+11/-5)
sikuli-script/src/main/java/org/sikuli/script/VDictProxy.java (+3/-2)
sikuli-script/src/main/java/org/sikuli/script/internal/hotkey/LinuxHotkeyManager.java (+3/-2)
sikuli-script/src/main/native/cvgui.cpp (+318/-0)
sikuli-script/src/main/native/cvgui.h (+1/-0)
sikuli-script/src/main/native/imgdb.cpp (+115/-0)
sikuli-script/src/main/native/imgdb.h (+5/-0)
sikuli-script/src/main/native/sikuli-debug.h (+1/-1)
sikuli-script/src/main/native/tessocr.cpp (+12/-3)
sikuli-script/src/main/native/vision.cpp (+63/-0)
sikuli-script/src/main/native/vision.h (+5/-0)
sikuli-script/src/main/native/vision.i (+10/-4)
sikuli-script/target/sikuli-script.sh (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1194489: Please merge sikuli 1.0~x~rc3.tesseract3-dfsg1-7 (universe) from Debian unstable (main)

Wishlist

Fix Released

Link a bug report

Related blueprints

17. By Yolanda Robla on 2013-07-24

added dep-3 headers in patch

16. By Yolanda Robla on 2013-07-24

debian/patches/force-java6-target.patch: fix lintian
warning for java bytecode

15. By Yolanda Robla on 2013-07-24

* Merge from Debian unstable.
* Dropped patches:
  - jgoodies-1.6-compat.patch: superseeded by new snapshot
* debian/patches/force-java6-target.patch: fix lintian warning for java bytecode
* Revert fix for java.lang.UnsatisfiedLinkError which was arch dependent
  while sikuli-ide is arch all /o\. By the way the corresponding bug
  (#714393) is now tagged wontfix since it's sun-java6 related.
* debian/control: fix VCS fields
* Add description for patch setTextAndMnemonic.patch
[tony mancill <email address hidden>]
* fix typo in d/control (Closes: #682011)
[Gilles Filippini <email address hidden>]
* new patch:
  + setTextAndMnemonic.patch: replace deprecated
    DefaultComponentFactory#setTextAndMnemonic with
    MnemonicUtils#configure (Closes: #711310)
* Updated patch:
  + executable-wrappers.patch: add /usr/lib/<multiarch-triplet>/jni to
    LD_LIBRARY_PATH (fix java.lang.UnsatisfiedLinkError for JXGrabKey)

14. By James Page on 2012-12-07

* Fix FTBFS with jgoodies >= 1.5:
  - d/control: BD on libjgoodies-common-java.
  - d/p/jgoodies-1.6-compat.patch: Compatibility patch which removes
    use of deprecated/removed methods and adds jgoodies-common to the
    build classpath.

13. By Gilles Filippini <email address hidden> on 2012-06-25

New patch no-opencv-surf-module.patch:
Remove unsused portions of source code with dependency on the opencv
SURF module which isn't shipped anymore starting with opencv 2.4
because of being non-free (Closes: #678230)

12. By Gilles Filippini <email address hidden> on 2012-06-04

* d/control: Depends: libopencv-dev to have OpenCVConfig.cmake (fix FTBFS)
* Fix patch executable-wrappers.patch:
  + Remove /usr/share/java/jna-posix.jar from the classpath so that it
    doesn't take precedence on /usr/share/java/jnr-posix.jar required
    by jython (Closes: #675160)
* d/README.Debian:
  + Add a note about Sun Java 6 and multiarch (workaround for
    java.lang.UnsatisfiedLinkError with java-6-sun)

11. By Gilles Filippini <email address hidden> on 2012-05-11

* New patch:
  + gcc-4.7.patch: Fix FTBFS with gcc-4.7 (Closes: #671990)

10. By Gilles Filippini <email address hidden> on 2012-04-16

* d/control:
  + sikuli-ide: Add missing dependency libswing-layout-java (fix
    ClassDefNotFound exception when opening the preferences dialog)
  + libsikuli-script-java: Add dependency tesseract-ocr-eng as a
    workaround for there is no way for the user to change the language
    setting for tesseract
  + Bump Standards-Version to 3.9.3
* d/copyright: Update URL of the Machine-readable format specification
  version 1.0
* New patch:
  + tessdata.patch: Use the default path for tesseract data, overridable
    with the TESSDATA_PREFIX environment variable (Closes: #667513,
    LP: #976352, LP: #979524)

9. By Gilles Filippini <email address hidden> on 2012-02-15

* Merge with the feature/tesseract3 branch from upstream
* debian/control: Build-Depends: libtesseract-dev instead of
  deprecated tesseract-ocr-dev (Closes: #659598)
* The upstream source code repository moved to github

* New patch:
  + tess3.patch:
    - Fix build with tesseract3
    - use OCR strategie OEM_TESSERACT_ONLY for now. Upstream has
      reported a 4x slowdown when using OEM_TESSERACT_CUBE_COMBINED
* Patch fix-cmake-sikuli-ide.patch:
  + Add a DEP3 style description
* debian/copyright:
  + Update DEP5 Format URL
  + Bump copyright years

8. By Adrien Cunin on 2012-02-13

Rebuild for opencv 2.3 transition