This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-jexl2-java.
commit ecb3ac277aa812eddfbdeac880e477304f330309 Author: Emmanuel Bourg <[email protected]> Date: Fri Apr 26 15:06:24 2013 +0000 Don't install /usr/share/java/commons-jexl.jar to avoid conflicts with libcommons-jexl-java (JEXL 1.x) --- debian/control | 2 +- debian/libcommons-jexl2-java.classpath | 2 +- debian/maven.properties | 1 + debian/rules | 9 ++++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 7157976..32958df 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Homepage: http://commons.apache.org/jexl/ Package: libcommons-jexl2-java Architecture: all -Depends: libcommons-logging-java +Depends: ${misc:Depends}, libcommons-logging-java Suggests: libcommons-jexl2-java-doc Description: Apache Commons JEXL - Java Expression Language JEXL is a library intended to facilitate the implementation of dynamic and diff --git a/debian/libcommons-jexl2-java.classpath b/debian/libcommons-jexl2-java.classpath index ad816f3..e4dc90b 100644 --- a/debian/libcommons-jexl2-java.classpath +++ b/debian/libcommons-jexl2-java.classpath @@ -1 +1 @@ -usr/share/java/commons-jexl.jar commons-logging.jar +usr/share/java/commons-jexl2.jar commons-logging.jar diff --git a/debian/maven.properties b/debian/maven.properties index c86ed49..ea16790 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1,2 +1,3 @@ +maven.test.skip = false maven.compiler.source = 1.5 maven.compiler.target = 1.5 diff --git a/debian/rules b/debian/rules index 5f485a4..e36bd2a 100755 --- a/debian/rules +++ b/debian/rules @@ -2,9 +2,16 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/maven.mk -include /usr/share/cdbs/1/class/javahelper.mk +#include /usr/share/cdbs/1/class/javahelper.mk JAVA_HOME := /usr/lib/jvm/default-java +binary-post-install/libcommons-jexl2-java:: + mh_installpoms -plibcommons-jexl2-java + mh_installjar -plibcommons-jexl2-java -l pom.xml -ncommons-jexl2 target/commons-jexl-$(DEB_UPSTREAM_VERSION).jar + rm debian/libcommons-jexl2-java/usr/share/java/commons-jexl.jar + rm debian/libcommons-jexl2-java/usr/share/java/commons-jexl-$(DEB_UPSTREAM_VERSION).jar + jh_classpath -plibcommons-jexl2-java + get-orig-source: uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-jexl2-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
