lp://staging/~cmiller/ubuntu/utopic/sikuli/lp1313398
- Get this branch:
- bzr branch lp://staging/~cmiller/ubuntu/utopic/sikuli/lp1313398
Branch merges
- Sebastien Bacher: Needs Information
- Ubuntu Sponsors: Pending requested
-
Diff: 901 lines (+314/-211)18 files modified.pc/applied-patches (+1/-0)
.pc/setTextAndMnemonic.patch/sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh (+29/-1)
debian/changelog (+13/-0)
debian/patches/executable-wrappers.patch (+46/-12)
debian/patches/fix-cmake-sikuli-ide.patch (+3/-5)
debian/patches/force-java6-target.patch (+6/-10)
debian/patches/gcc-4.7.patch (+3/-5)
debian/patches/install-extension.patch (+3/-5)
debian/patches/missing-class-paths.patch (+31/-0)
debian/patches/native.patch (+35/-45)
debian/patches/no-opencv-surf-module.patch (+23/-37)
debian/patches/series (+1/-0)
debian/patches/setTextAndMnemonic.patch (+41/-43)
debian/patches/tess3.patch (+6/-10)
debian/patches/tessdata.patch (+11/-17)
debian/patches/use-java-libs-from-debian.patch (+15/-19)
sikuli-ide/target/linux/Sikuli-IDE/sikuli-ide.sh (+30/-1)
sikuli-script/target/sikuli-script.sh (+17/-1)
Branch information
- Owner:
- Chad Miller
- Status:
- Development
Recent revisions
- 17. By Chad Miller
-
Split previous commit into a separate patch. debian/
patches/ missing- class-paths. patch - 16. By Chad Miller
-
debian/
patches/ executable- wrappers. patch,
debian/patches/ setTextAndMnemo nic.patch: Make astonishingly unpatchable
exec wrapper patchable. Add jar files to class path
/usr/share/maven-repo/ org/jruby/ extras/ jaffl/debian/ jaffl-debian. jar
/usr/share/maven-repo/ org/jruby/ ext/posix/ jnr-posix/ debian/ jnr-posix- debian. jar
/usr/share/maven-repo/ com/google/ guava/guava/ debian/ guava-debian. jar
and add -Djruby.native. enabled= false definition to use POSIX code path in
jruby/jaffl. (LP: #1313398) - 15. By Yolanda Robla
-
* 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 - 14. By James Page
-
* 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>
-
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>
-
* 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.Unsatisfie dLinkError with java-6-sun) - 11. By Gilles Filippini <email address hidden>
-
* New patch:
+ gcc-4.7.patch: Fix FTBFS with gcc-4.7 (Closes: #671990) - 10. By Gilles Filippini <email address hidden>
-
* 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>
-
* 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
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp://staging/ubuntu/utopic/sikuli