[jenkins-xstream] 06/13: - d/control: Add new BD on libkxml2-java. - d/maven.rules, ignoreRules: Ignore xmlpull requirement and remap to be provided from libxpp3-java.

James Downing Page jamespage at alioth.debian.org
Mon Aug 12 13:20:01 UTC 2013


This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository jenkins-xstream.

commit 06d5457c2919152ce7862331e6ac3427814a50ae
Author: James Page <james.page at ubuntu.com>
Date:   Mon Aug 12 13:43:11 2013 +0100

      - d/control: Add new BD on libkxml2-java.
      - d/maven.rules,ignoreRules: Ignore xmlpull requirement and remap
        to be provided from libxpp3-java.
---
 debian/changelog         |    3 +++
 debian/control           |    1 +
 debian/maven.ignoreRules |    3 ++-
 debian/maven.rules       |    1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index eef0b56..58b14dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ jenkins-xstream (1.4.4-jenkins-3-1) UNRELEASED; urgency=low
 
   * New upstream release:
     - d/p/*: Refreshed patches.
+    - d/control: Add new BD on libkxml2-java.
+    - d/maven.rules,ignoreRules: Ignore xmlpull requirement and remap
+      to be provided from libxpp3-java.
 
  -- James Page <james.page at ubuntu.com>  Mon, 12 Aug 2013 13:15:27 +0100
 
diff --git a/debian/control b/debian/control
index 3ea6bf2..b17026c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends-Indep:
  libjdom1-java-doc,
  libjettison-java,
  libjoda-time-java,
+ libkxml2-java,
  libmaven-antrun-plugin-java,
  libmaven-assembly-plugin-java,
  libmaven-dependency-plugin-java,
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index cc60442..ea53315 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -23,5 +23,6 @@ org.apache.maven.wagon wagon-webdav * * * *
 org.codehaus.mojo cobertura-maven-plugin * * * *
 org.codehaus.mojo jxr-maven-plugin * * * *
 org.codehaus.xsite xsite-maven-plugin * * * *
-org.jvnet.wagon-svn wagon-svn * * * * 
+org.jvnet.wagon-svn wagon-svn * * * *
 jmock jmock * * * *
+xmlpull xmlpull * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 755e3b7..61c7a7a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -21,3 +21,4 @@ s/com\.thoughtworks\.xstream/org.jvnet.hudson/ xstream-parent pom s/.*/debian/ *
 s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
 junit junit jar s/3\..*/3.x/ * *
 org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/ jar s/.*/debian/ * *
+xpp3 s/xpp3_min/xpp3/ * s/.*/debian/ * *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-xstream.git



More information about the pkg-java-commits mailing list