This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit dd0070fee672e435d652a37a1c8bdfd85b354fb6 Author: Gilles Filippini <[email protected]> Date: Sun Oct 1 14:32:55 2017 +0200 Build against libasm-java instead of libasm3-java Fix run-time error with jython 2.7: Exception in thread "main" java.lang.IncompatibleClassChangeError: class org.python.core.packagecache.PackageManager$AccessVisitor has interface org.objectweb.asm.ClassVisitor as super class --- debian/changelog | 7 +++++++ debian/control | 6 +++--- debian/maven.rules | 2 +- debian/maven.rules.ours | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 267e708..ca30d26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sikulix (1.1.1-2) unstable; urgency=medium + + * Build-Depends: replace libasm3-java with libasm-java to support + jython 2.7 at run-time + + -- Gilles Filippini <[email protected]> Sun, 01 Oct 2017 14:32:34 +0200 + sikulix (1.1.1-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 1fc925d..f139fd1 100644 --- a/debian/control +++ b/debian/control @@ -5,14 +5,14 @@ Maintainer: Debian Java maintainers <[email protected] Uploaders: Gilles Filippini <[email protected]> Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 2:1.7) , maven-debian-helper, libmaven-exec-plugin-java, libmaven-source-plugin-java - , libmaven-javadoc-plugin-java, jython, jruby, swig + , libmaven-javadoc-plugin-java, jython (>= 2.7.1), jruby, swig , libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java , libswing-layout-java, libswingx-java, libjgoodies-forms-java , libjson-simple-java, libmac-widgets-java , libjackson2-core-java , libjackson2-databind-java, junit4, libjavassist-java, libjna-java , libbytelist-java, libjruby-joni-java, libjoda-time-java , libcommons-exec-java, libmetainf-services-java - , libjline-java, libasm3-java + , libjline-java, libasm-java , autoconf, automake, libtool # We only use the docs from java packages kept in the 'Depends' field of # libsikulixapi-java @@ -44,7 +44,7 @@ Package: libsikulixapi-java Architecture: all Replaces: libsikuli-script-java (<< 1.1.0~) Breaks: libsikuli-script-java (<< 1.1.0~) -Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython (>= 2.5.3-12), wmctrl, xdotool, tesseract-ocr-eng +Depends: ${maven:Depends}, ${misc:Depends}, default-jre (>= 2:1.7) | java6-runtime, libsikulixapi-jni (>= ${binary:Version}), libsikulixapi-jni (<< ${source:Version}+), jython (>= 2.7.1), wmctrl, xdotool, tesseract-ocr-eng # These ones miss maven integration , libcommons-exec-java, libopencv2.4-java # The script sikuli2html.py needs python diff --git a/debian/maven.rules b/debian/maven.rules index 6b6e8e7..2086784 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -6,7 +6,7 @@ s/org\.javassist/javassist/ javassist jar s/.*/debian/ * * org.jruby jruby-complete jar s/.*/debian/ * * s/org\.swinglabs\.swingx/org.swinglabs/ s/swingx-.*/swingx-core/ jar s/1\..*/1.x/ * * junit junit jar s/4\..*/4.x/ * * -asm * jar s/3\..*/3.x/ * * +s/asm/org.ow2.asm/ * jar s/3\..*/debian/ * * # Because #796933 org.antlr antlr-runtime jar 3.2 * * # diff --git a/debian/maven.rules.ours b/debian/maven.rules.ours index 6b6e8e7..2086784 100644 --- a/debian/maven.rules.ours +++ b/debian/maven.rules.ours @@ -6,7 +6,7 @@ s/org\.javassist/javassist/ javassist jar s/.*/debian/ * * org.jruby jruby-complete jar s/.*/debian/ * * s/org\.swinglabs\.swingx/org.swinglabs/ s/swingx-.*/swingx-core/ jar s/1\..*/1.x/ * * junit junit jar s/4\..*/4.x/ * * -asm * jar s/3\..*/3.x/ * * +s/asm/org.ow2.asm/ * jar s/3\..*/debian/ * * # Because #796933 org.antlr antlr-runtime jar 3.2 * * # -- 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
