[xsom] 01/01: don't use lic.jar, and use relaxngcc.jar from the package

[Timo Aaltonen]

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

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

commit 2a516bc0ceaab2e65d9b052315b7253bd482e0fa
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Tue Dec 17 13:43:52 2013 +0200

    don't use lic.jar, and use relaxngcc.jar from the package
---
 debian/control                  |  3 ++-
 debian/patches/mangle-jars.diff | 25 +++++++++++++++++++++++++
 debian/patches/series           |  1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 51bf716..5a2a756 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Timo Aaltonen <tjaalton at ubuntu.com>
 Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper (>= 1.6)
 Build-Depends-Indep: libbuild-helper-maven-plugin-java,
  libmaven-antrun-plugin-java,
- librelaxng-datatype-java (>= 1.0),  
+ librelaxng-datatype-java (>= 1.0),
+ librelaxngcc-java,
  junit4,
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/xsom.git
diff --git a/debian/patches/mangle-jars.diff b/debian/patches/mangle-jars.diff
new file mode 100644
index 0000000..d4a20e9
--- /dev/null
+++ b/debian/patches/mangle-jars.diff
@@ -0,0 +1,25 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -146,19 +146,20 @@
+                         <phase>generate-sources</phase>
+                         <configuration>
+                             <tasks>
++<!--
+                                 <taskdef name="licence" classname="com.sun.tools.LicenceTask">
+                                   <classpath>
+                                     <pathelement path="lib/lic.jar" />
+                                   </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" />
+                                     <arg path="build/src/com/sun/xml/xsom/impl/parser/state" />
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b752b29
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+mangle-jars.diff

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