[pkg-java] r16574 - trunk/libcommons-jexl2-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-04-26 15:06:24 +0000 (Fri, 26 Apr 2013)
New Revision: 16574

Modified:
   trunk/libcommons-jexl2-java/debian/control
   trunk/libcommons-jexl2-java/debian/libcommons-jexl2-java.classpath
   trunk/libcommons-jexl2-java/debian/maven.properties
   trunk/libcommons-jexl2-java/debian/rules
Log:
Don't install /usr/share/java/commons-jexl.jar to avoid conflicts with libcommons-jexl-java (JEXL 1.x)


Modified: trunk/libcommons-jexl2-java/debian/control
===================================================================
--- trunk/libcommons-jexl2-java/debian/control	2013-04-26 12:10:50 UTC (rev 16573)
+++ trunk/libcommons-jexl2-java/debian/control	2013-04-26 15:06:24 UTC (rev 16574)
@@ -14,7 +14,7 @@
 
 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

Modified: trunk/libcommons-jexl2-java/debian/libcommons-jexl2-java.classpath
===================================================================
--- trunk/libcommons-jexl2-java/debian/libcommons-jexl2-java.classpath	2013-04-26 12:10:50 UTC (rev 16573)
+++ trunk/libcommons-jexl2-java/debian/libcommons-jexl2-java.classpath	2013-04-26 15:06:24 UTC (rev 16574)
@@ -1 +1 @@
-usr/share/java/commons-jexl.jar commons-logging.jar
+usr/share/java/commons-jexl2.jar commons-logging.jar

Modified: trunk/libcommons-jexl2-java/debian/maven.properties
===================================================================
--- trunk/libcommons-jexl2-java/debian/maven.properties	2013-04-26 12:10:50 UTC (rev 16573)
+++ trunk/libcommons-jexl2-java/debian/maven.properties	2013-04-26 15:06:24 UTC (rev 16574)
@@ -1,2 +1,3 @@
+maven.test.skip = false
 maven.compiler.source = 1.5
 maven.compiler.target = 1.5

Modified: trunk/libcommons-jexl2-java/debian/rules
===================================================================
--- trunk/libcommons-jexl2-java/debian/rules	2013-04-26 12:10:50 UTC (rev 16573)
+++ trunk/libcommons-jexl2-java/debian/rules	2013-04-26 15:06:24 UTC (rev 16574)
@@ -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