Please merge sikuli 1.0~x~rc3.tesseract3-dfsg1-7 (universe) from Debian unstable (main)
Bug #1194489 reported by
Yolanda Robla
This bug affects 1 person
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| sikuli (Ubuntu) |
Fix Released
|
Wishlist
|
Unassigned | ||
Bug Description
Please merge sikuli 1.0~x~rc3.
Related branches
lp:~yolanda.robla/ubuntu/saucy/sikuli/debian_merge
- Daniel Holbach (community): Approve
-
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)
Revision history for this message
| Yolanda Robla (yolanda.robla) wrote | #1 |
| Changed in sikuli (Ubuntu): | |
| status: | New → In Progress |
| importance: | Undecided → Wishlist |
| assignee: | nobody → Yolanda Robla (yolanda.robla) |
| Changed in sikuli (Ubuntu): | |
| status: | In Progress → Confirmed |
| assignee: | Yolanda Robla (yolanda.robla) → nobody |
Revision history for this message
| Luke Yelavich (themuso) wrote | #2 |
Revision history for this message
| Yolanda Robla (yolanda.robla) wrote | #3 |
Revision history for this message
| Yolanda Robla (yolanda.robla) wrote | #4 |
| summary: |
- Please merge sikuli 1.0~x~rc3.tesseract3-dfsg1-6 (universe) from Debian + Please merge sikuli 1.0~x~rc3.tesseract3-dfsg1-7 (universe) from Debian unstable (main) |
| description: | updated |
Revision history for this message
| Logan Rosen (logan) wrote | #5 |
| Changed in sikuli (Ubuntu): | |
| status: | Confirmed → Fix Released |
To post a comment you must log in.
Debdiff between debian and new ubuntu version