[xsom] 01/01: Use a build property instead of a patch to use relaxngcc.jar from /usr/share/java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository xsom.

commit ed1bebb3c5ea657891d3331327bc507dcdb3a443
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 17 16:14:02 2013 +0100

    Use a build property instead of a patch to use relaxngcc.jar from /usr/share/java
---
 debian/maven.properties                                    |  1 +
 ...-mangle-jars.diff => 01-disable-license-ant-task.patch} | 14 ++++----------
 debian/patches/series                                      |  2 +-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/maven.properties b/debian/maven.properties
index c67a92a..bd43885 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -3,3 +3,4 @@
 # maven.test.skip=true
 
 project.build.sourceEncoding=UTF-8
+relaxngcc-jar=/usr/share/java/relaxngcc.jar
diff --git a/debian/patches/01-mangle-jars.diff b/debian/patches/01-disable-license-ant-task.patch
similarity index 66%
rename from debian/patches/01-mangle-jars.diff
rename to debian/patches/01-disable-license-ant-task.patch
index d6cc0b2..6f2e5c5 100644
--- a/debian/patches/01-mangle-jars.diff
+++ b/debian/patches/01-disable-license-ant-task.patch
@@ -1,9 +1,9 @@
-Description: Disables the license Ant tasks and use the relaxngcc jar from the Debian package
+Description: Disables the license Ant tasks
 Author: Timo Aaltonen <tjaalton at ubuntu.com>
 Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -146,27 +146,30 @@
+@@ -146,12 +146,13 @@
                          <phase>generate-sources</phase>
                          <configuration>
                              <tasks>
@@ -14,17 +14,11 @@ Forwarded: not-needed
                                    </classpath>
                                  </taskdef>
 -                                
-+-->                                
++-->
                                  <mkdir dir="build/automata" />
  
                                  <!-- delete old files to avoid corruption -->
-                                 <delete dir="build/src" />
-                                 <mkdir dir="build/src/com/sun/xml/xsom/impl/parser/state" />
- 
--                                <property name="relaxngcc-jar" value="lib/relaxngcc.jar" />
-+                                <property name="relaxngcc-jar" value="/usr/share/java/relaxngcc.jar" />
-                                 <java jar="${relaxngcc-jar}" fork="true">
-                                     <arg value="--target" />
+@@ -164,9 +165,11 @@
                                      <arg path="build/src/com/sun/xml/xsom/impl/parser/state" />
                                      <arg path="src/xmlschema.rng" />
                                  </java>
diff --git a/debian/patches/series b/debian/patches/series
index 56e6b54..2fa906e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-01-mangle-jars.diff
+01-disable-license-ant-task.patch
 02-use-local-schemas.patch

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