This is an automated email from the git hooks/post-receive script. pini pushed a commit to branch master in repository sikuli.
commit 38e7a9c7bfc81be00d13bbb1e834bc9adbc68e1d Author: Gilles Filippini <[email protected]> Date: Mon May 12 03:16:30 2014 +0200 Use option '--package=<package>' in .poms so that corresponding artifacts and pom files are installed directly at the right place. --- debian/libsikuli-script-java.install | 10 ---------- debian/libsikuli-script-java.poms | 28 ++++++++++++++++++++++++++++ debian/sikuli-ide.install | 1 - debian/sikuli-ide.poms | 28 ++++++++++++++++++++++++++++ debian/tmp.poms | 16 ++++++++-------- 5 files changed, 64 insertions(+), 19 deletions(-) diff --git a/debian/libsikuli-script-java.install b/debian/libsikuli-script-java.install index cbc2612..c778f48 100644 --- a/debian/libsikuli-script-java.install +++ b/debian/libsikuli-script-java.install @@ -1,13 +1,3 @@ -usr/share/maven-repo/org/sikuli/SikuliX-Natives -usr/share/maven-repo/org/sikuli/SikuliX-Basics -usr/share/maven-repo/org/sikuli/SikuliX-Jython -usr/share/maven-repo/org/sikuli/SikuliX-JRuby -usr/share/maven-repo/org/sikuli/SikuliX-API -usr/share/java/SikuliX-Natives*.jar -usr/share/java/SikuliX-Basics*.jar -usr/share/java/SikuliX-Jython*.jar -usr/share/java/SikuliX-JRuby*.jar -usr/share/java/SikuliX-API*.jar Basics/src/main/resources/Lib usr/share/sikuli Jython/src/main/resources/scripts usr/share/sikuli debian/wrappers/sikuli usr/bin diff --git a/debian/libsikuli-script-java.poms b/debian/libsikuli-script-java.poms index 2fc1b8a..758b6cd 100644 --- a/debian/libsikuli-script-java.poms +++ b/debian/libsikuli-script-java.poms @@ -1,5 +1,33 @@ +# 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] +# Natives/pom.xml --no-parent Basics/pom.xml --no-parent Jython/pom.xml --no-parent JRuby/pom.xml --no-parent +Tesseract4SikuliX/pom.xml --no-parent API/pom.xml --no-parent diff --git a/debian/sikuli-ide.install b/debian/sikuli-ide.install index f3acecc..3838606 100644 --- a/debian/sikuli-ide.install +++ b/debian/sikuli-ide.install @@ -1,2 +1 @@ -usr/share/java/SikuliX-IDE.jar usr/share/sikuli debian/wrappers/sikuli-ide usr/bin diff --git a/debian/sikuli-ide.poms b/debian/sikuli-ide.poms index c15202b..bc73ac3 100644 --- a/debian/sikuli-ide.poms +++ b/debian/sikuli-ide.poms @@ -1 +1,29 @@ +# 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] +# +Jygments4SikuliX/pom.xml --no-parent IDE/pom.xml --no-parent diff --git a/debian/tmp.poms b/debian/tmp.poms index ad7c350..869aec2 100644 --- a/debian/tmp.poms +++ b/debian/tmp.poms @@ -26,11 +26,11 @@ # Empty by default. [mh_install] # pom.xml -Natives/pom.xml --java-lib -Basics/pom.xml --java-lib -Jython/pom.xml --java-lib -JRuby/pom.xml --java-lib -Tesseract4SikuliX/pom.xml --java-lib -Jygments4SikuliX/pom.xml --java-lib -API/pom.xml --java-lib -IDE/pom.xml --java-lib +Natives/pom.xml --package=libsikuli-script-java --java-lib +Basics/pom.xml --package=libsikuli-script-java --java-lib +Jython/pom.xml --package=libsikuli-script-java --java-lib +JRuby/pom.xml --package=libsikuli-script-java --java-lib +Tesseract4SikuliX/pom.xml --package=libsikuli-script-java --java-lib +API/pom.xml --package=libsikuli-script-java --java-lib +Jygments4SikuliX/pom.xml --package=sikuli-ide --java-lib +IDE/pom.xml --package=sikuli-ide --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
