This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 62db29bb728a21e39675729fa5949d687240955c Author: Gilles Filippini <[email protected]> Date: Sat May 10 10:46:26 2014 +0200 Update dependencies --- debian/control | 1 + debian/maven.ignoreRules | 2 ++ debian/maven.ignoreRules.real | 2 ++ debian/maven.rules | 18 ++++++++------ debian/patches/no-maven-repo-dependencies.patch | 33 +++++++++++++++++-------- debian/patches/pom-removed-modules.patch | 20 +++++++++------ debian/patches/series | 2 +- debian/tmp.poms | 27 ++++++++++++++++++++ 8 files changed, 78 insertions(+), 27 deletions(-) diff --git a/debian/control b/debian/control index e71a984..494fe3a 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,7 @@ Uploaders: Gilles Filippini <[email protected]> Build-Depends: debhelper (>= 9~), cdbs, default-jdk (>= 1:1.6), maven-debian-helper, libmaven-exec-plugin-java, jython, junit, swig, libopencv-dev, libtesseract-dev, libjxgrabkey-java, libcommons-cli-java, libswing-layout-java, libswingx-java, libjgoodies-forms-java, libjson-simple-java, libmac-widgets-java, default-jdk-doc, jython-doc, junit-doc, libswing-layout-java-doc, libswingx-java-doc, libjxgrabkey-doc, libjgoodies-forms-java-doc, libjson-simple-doc, libmac-widgets-doc + , libjackson2-core-java, libjackson2-databind-java, testng, libjavassist-java, libjna-java, jruby, libbytelist-java, libjruby-joni-java, libjoda-time-java Standards-Version: 3.9.5 Homepage: http://sikuli.org Vcs-Git: git://anonscm.debian.org/pkg-java/sikuli.git diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index ed3a4fb..a1f76db 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,2 +1,4 @@ com.melloware jintellitype jar * * * +com.nativelibs4java bridj jar * * * +net.java.dev.jai-imageio jai-imageio-core-standalone jar * * * diff --git a/debian/maven.ignoreRules.real b/debian/maven.ignoreRules.real index ed3a4fb..a1f76db 100644 --- a/debian/maven.ignoreRules.real +++ b/debian/maven.ignoreRules.real @@ -1,2 +1,4 @@ com.melloware jintellitype jar * * * +com.nativelibs4java bridj jar * * * +net.java.dev.jai-imageio jai-imageio-core-standalone jar * * * diff --git a/debian/maven.rules b/debian/maven.rules index 926fb5f..67f46a8 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,11 +1,13 @@ + +com.fasterxml.jackson.core jackson-core jar s/2\..*/2.x/ * * +com.fasterxml.jackson.core jackson-databind jar s/2\..*/2.x/ * * com.jgoodies s/common/jgoodies-common/ jar s/1\..*/1.x/ * * com.jgoodies s/forms/jgoodies-forms/ jar s/.*/debian/ * * -org.sikuli SikuliX-API jar * * * -org.sikuli SikuliX-Basics jar * * * -org.sikuli SikuliX-IDE jar * * * -org.sikuli SikuliX-Jython jar * * * -org.sikuli SikuliX-VisionProxy jar * * * -org.sikuli SikuliX pom * * * +com.jgoodies jgoodies-common jar s/1\..*/1.x/ * * +junit junit jar s/4\\..*/4.x/ * * +s/org\.javassist/javassist/ javassist jar s/.*/debian/ * * +org.jruby s/jruby-complete/jruby/ jar s/.*/debian/ * * +org.swinglabs swingx-core jar s/1\..*/1.x/ * * s/org\.swinglabs\.swingx/org.swinglabs/ swingx-core jar s/1\..*/1.x/ * * -junit junit * s/3\..*/3.x/ * * -junit junit * s/4\..*/4.x/ * * +org.testng testng jar s/6\..*/6.x/ * * +s/jboss/javassist/ javassist * s/.*/debian/ * * diff --git a/debian/patches/no-maven-repo-dependencies.patch b/debian/patches/no-maven-repo-dependencies.patch index b47af2a..c8ac084 100644 --- a/debian/patches/no-maven-repo-dependencies.patch +++ b/debian/patches/no-maven-repo-dependencies.patch @@ -1,23 +1,23 @@ Description: Add system scope for not yet mavenized dependencies Author: Gilles Filippini <[email protected]> -Index: sikuli/jython/pom.xml +Index: sikuli-1.1.0~beta1/Jython/pom.xml =================================================================== ---- sikuli.orig/jython/pom.xml 2013-10-19 15:16:52.000000000 +0200 -+++ sikuli/jython/pom.xml 2013-10-19 15:16:52.000000000 +0200 -@@ -65,6 +65,8 @@ +--- sikuli-1.1.0~beta1.orig/Jython/pom.xml 2014-05-05 17:28:24.000000000 +0000 ++++ sikuli-1.1.0~beta1/Jython/pom.xml 2014-05-10 09:13:04.501868695 +0000 +@@ -41,6 +41,8 @@ <groupId>org.python</groupId> <artifactId>jython-standalone</artifactId> - <version>2.5.4-rc1</version> + <version>2.7-b1</version> + <scope>system</scope> + <systemPath>/usr/share/java/jython.jar</systemPath> </dependency> </dependencies> -Index: sikuli/ide/pom.xml +Index: sikuli-1.1.0~beta1/IDE/pom.xml =================================================================== ---- sikuli.orig/ide/pom.xml 2013-10-19 15:16:52.000000000 +0200 -+++ sikuli/ide/pom.xml 2013-10-19 15:16:52.000000000 +0200 -@@ -138,6 +138,8 @@ +--- sikuli-1.1.0~beta1.orig/IDE/pom.xml 2014-05-10 09:12:32.000000000 +0000 ++++ sikuli-1.1.0~beta1/IDE/pom.xml 2014-05-10 09:13:04.509868746 +0000 +@@ -62,6 +62,8 @@ <groupId>com.explodingpixels</groupId> <artifactId>mac_widgets</artifactId> <version>0.9.5</version> @@ -25,4 +25,17 @@ Index: sikuli/ide/pom.xml + <systemPath>/usr/share/java/mac_widgets.jar</systemPath> </dependency> <dependency> - <groupId>junit</groupId> + <groupId>org.sikuli</groupId> +Index: sikuli-1.1.0~beta1/API/pom.xml +=================================================================== +--- sikuli-1.1.0~beta1.orig/API/pom.xml 2014-05-10 09:13:04.509868746 +0000 ++++ sikuli-1.1.0~beta1/API/pom.xml 2014-05-10 09:20:58.016825706 +0000 +@@ -37,6 +37,8 @@ + <groupId>org.sikuli</groupId> + <artifactId>OpenCV4SikuliX</artifactId> + <version>2.4.7</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/OpenCV/java/opencv-248.jar</systemPath> + </dependency> + </dependencies> + diff --git a/debian/patches/pom-removed-modules.patch b/debian/patches/pom-removed-modules.patch index 2ebe36f..4287e35 100644 --- a/debian/patches/pom-removed-modules.patch +++ b/debian/patches/pom-removed-modules.patch @@ -1,8 +1,8 @@ -Index: sikuli/pom.xml +Index: sikuli-1.1.0~beta1/pom.xml =================================================================== ---- sikuli.orig/pom.xml 2014-05-08 18:01:57.000000000 +0200 -+++ sikuli/pom.xml 2014-05-08 18:05:22.986137723 +0200 -@@ -219,9 +219,7 @@ +--- sikuli-1.1.0~beta1.orig/pom.xml 2014-05-09 12:56:45.758974512 +0000 ++++ sikuli-1.1.0~beta1/pom.xml 2014-05-09 12:57:31.991252533 +0000 +@@ -219,22 +219,13 @@ <modules> <module>Jygments4SikuliX</module> @@ -11,11 +11,15 @@ Index: sikuli/pom.xml - <module>Libs</module> <module>Natives</module> <module>Basics</module> - <module>Setup</module> -@@ -233,8 +231,6 @@ - <module>APIFat</module> +- <module>Setup</module> + <module>Jython</module> +- <module>JythonFat</module> + <module>JRuby</module> +- <module>JRubyFat</module> + <module>API</module> +- <module>APIFat</module> <module>IDE</module> - <module>IDEFat</module> +- <module>IDEFat</module> - <module>MacApp</module> - <module>Tesseract</module> <module>Remote</module> diff --git a/debian/patches/series b/debian/patches/series index 18e82fb..abdf50f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,6 +11,6 @@ setTextAndMnemonic.patch #add-classpath.patch #preserve-source-utf-8.patch basics-exclude-windows-mac.patch -#no-maven-repo-dependencies.patch +no-maven-repo-dependencies.patch #resources-out-of-jar.patch pom-removed-modules.patch diff --git a/debian/tmp.poms b/debian/tmp.poms index adf9032..ad7c350 100644 --- a/debian/tmp.poms +++ b/debian/tmp.poms @@ -1,3 +1,30 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# pom.xml Natives/pom.xml --java-lib Basics/pom.xml --java-lib -- 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
