[SCM] jenkins-dom4j packaging branch, master, updated. debian/1.6.1-hudson-3-3-3-gaef775d

Emmanuel Bourg ebourg at apache.org
Wed Jun 26 22:38:56 UTC 2013


The following commit has been merged in the master branch:
commit cfe32b295674675142c83d43a26b31cb48e5747a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jun 27 00:19:13 2013 +0200

    Removed the dependency on libjaxme-java

diff --git a/debian/control b/debian/control
index 753553b..18b5490 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Build-Depends-Indep:
  antlr,
  junit,
  libjaxen-java,
- libjaxme-java,
  libjunitperf-java,
  libmsv-java,
  librelaxng-datatype-java,
@@ -31,7 +30,6 @@ Package: libjenkins-dom4j-java
 Architecture: all
 Depends:
  libjaxen-java,
- libjaxme-java,
  libmsv-java,
  libxpp2-java,
  libxpp3-java,
diff --git a/debian/libjenkins-dom4j-java.classpath b/debian/libjenkins-dom4j-java.classpath
index 7e7b52a..2d5b6ef 100644
--- a/debian/libjenkins-dom4j-java.classpath
+++ b/debian/libjenkins-dom4j-java.classpath
@@ -1 +1 @@
-build/dom4j.jar /usr/share/java/backport-util-concurrent.jar /usr/share/java/jaxen.jar /usr/share/java/jaxmeapi.jar /usr/share/java/xpp2.jar /usr/share/java/xpp3.jar
+build/dom4j.jar /usr/share/java/jaxen.jar /usr/share/java/xpp2.jar /usr/share/java/xpp3.jar
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..9afcc1b
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+jaxme jaxme-api * * * *
diff --git a/debian/rules b/debian/rules
index ed7ea84..4f2dba0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ JAVA_HOME	     := /usr/lib/jvm/default-java
 PACKAGE              := jenkins-dom4j
 DEB_ANT_BUILD_TARGET := package release-javadoc 
 DEB_ANT_CHECK_TARGET := test
-DEB_JARS 	     := ant ant-launcher xpp2 xpp3 jaxen jaxmeapi \
+DEB_JARS 	     := ant ant-launcher xpp2 xpp3 jaxen \
 	                xalan2 xercesImpl ant-junit junit junitperf xsdlib
 
 binary-post-install/lib$(PACKAGE)-java::

-- 
jenkins-dom4j packaging



More information about the pkg-java-commits mailing list