[xsom] 01/01: Ignore the license Ant task

[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 896418166cb4ff6a64f3d196dabe9025f41f06c1
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Dec 17 13:46:28 2013 +0100

    Ignore the license Ant task
---
 debian/patches/{mangle-jars.diff => 01-mangle-jars.diff} | 15 ++++++++++++++-
 debian/patches/series                                    |  2 +-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/debian/patches/mangle-jars.diff b/debian/patches/01-mangle-jars.diff
similarity index 66%
rename from debian/patches/mangle-jars.diff
rename to debian/patches/01-mangle-jars.diff
index d4a20e9..d6cc0b2 100644
--- a/debian/patches/mangle-jars.diff
+++ b/debian/patches/01-mangle-jars.diff
@@ -1,6 +1,9 @@
+Description: Disables the license Ant tasks and use the relaxngcc jar from the Debian package
+Author: Timo Aaltonen <tjaalton at ubuntu.com>
+Forwarded: not-needed
 --- a/pom.xml
 +++ b/pom.xml
-@@ -146,19 +146,20 @@
+@@ -146,27 +146,30 @@
                          <phase>generate-sources</phase>
                          <configuration>
                              <tasks>
@@ -23,3 +26,13 @@
                                  <java jar="${relaxngcc-jar}" fork="true">
                                      <arg value="--target" />
                                      <arg path="build/src/com/sun/xml/xsom/impl/parser/state" />
+                                     <arg path="src/xmlschema.rng" />
+                                 </java>
++<!--
+                                 <licence licence="licenceheader.txt">
+                                   <fileset dir="build/src/" includes="com/sun/xml/xsom/impl/parser/state/*.java" />
+                                 </licence>
++-->
+                             </tasks>
+                         </configuration>
+                         <goals>
diff --git a/debian/patches/series b/debian/patches/series
index b752b29..e9dcb24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-mangle-jars.diff
+01-mangle-jars.diff

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