[relaxngcc] 03/03: move the build.xml as a patchfile instead

[Timo Aaltonen]

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

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

commit 39299c6ed88ea35e4cacbebf3bd209a282bbae97
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Fri Jan 10 16:45:48 2014 +0200

    move the build.xml as a patchfile instead
---
 debian/patches/add-build-xml.diff | 58 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 debian/relaxngcc-build.xml        | 55 -------------------------------------
 debian/rules                      |  5 ----
 4 files changed, 59 insertions(+), 60 deletions(-)

diff --git a/debian/patches/add-build-xml.diff b/debian/patches/add-build-xml.diff
new file mode 100644
index 0000000..955cbd5
--- /dev/null
+++ b/debian/patches/add-build-xml.diff
@@ -0,0 +1,58 @@
+--- /dev/null
++++ b/build.xml
+@@ -0,0 +1,55 @@
++<?xml version="1.0"?>
++
++<project name="relaxngcc" default="jar">
++
++  <!-- Clean up: -->
++  <target name="clean">
++    <delete dir="bin"/>
++    <delete dir="javadoc"/>
++    <delete dir="lib"/>
++    <delete file="relaxngcc.jar"/>
++    <delete>
++       <fileset dir="src/relaxngcc/javabody/" includes="*.java"/>
++    </delete>
++  </target>
++
++  <!-- Compile Java source files: -->
++  <target name="compile">
++    <mkdir dir="bin"/>
++    <javacc target="src/relaxngcc/javabody/JavaBodyParser.jj" outputdirectory="src/relaxngcc/javabody" javacchome="/usr/share/java" static="false"/>
++    <javac srcdir="src" destdir="bin" debug="on" optimize="off" classpath="/usr/share/java">
++      <classpath>
++        <fileset dir="/usr/share/java" includes="**/*.jar"/>
++      </classpath>
++    </javac>
++  </target>
++
++  <!-- Generate javadoc documentation: -->
++  <target name="javadoc" depends="compile">
++    <mkdir dir="javadoc"/>
++    <javadoc locale="en_US" sourcepath="src" destdir="javadoc" windowtitle="RelaxNGCC" public="yes">
++      <package name="relaxngcc.*"/>
++      <classpath>
++        <fileset dir="/usr/share/java" includes="*.jar"/>
++      </classpath>
++    </javadoc>
++  </target>
++
++  <!-- Create the jar file: -->
++  <target name="jar" depends="compile">
++    <tstamp/>
++    <jar jarfile="relaxngcc.jar">
++      <manifest>
++        <attribute name="Version" value="${DSTAMP}"/>
++        <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
++       </manifest>
++      <fileset dir="src" includes="**/*.properties"/>
++      <fileset dir="src" includes="**/*.xsl"/>
++      <fileset dir="src" includes="**/*.jelly"/>
++      <fileset dir="src" includes="relaxngcc/runtime/*.java"/>
++      <fileset dir="bin" includes="**/*.class"/>
++      <fileset dir="." includes="project.xml"/>
++    </jar>
++  </target>
++
++</project>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8eade6e
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+add-build-xml.diff
diff --git a/debian/relaxngcc-build.xml b/debian/relaxngcc-build.xml
deleted file mode 100644
index eca5391..0000000
--- a/debian/relaxngcc-build.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="relaxngcc" default="jar">
-
-  <!-- Clean up: -->
-  <target name="clean">
-    <delete dir="bin"/>
-    <delete dir="javadoc"/>
-    <delete dir="lib"/>
-    <delete file="relaxngcc.jar"/>
-    <delete>
-       <fileset dir="src/relaxngcc/javabody/" includes="*.java"/>
-    </delete>
-  </target>
-
-  <!-- Compile Java source files: -->
-  <target name="compile">
-    <mkdir dir="bin"/>
-    <javacc target="src/relaxngcc/javabody/JavaBodyParser.jj" outputdirectory="src/relaxngcc/javabody" javacchome="/usr/share/java" static="false"/>
-    <javac srcdir="src" destdir="bin" debug="on" optimize="off" classpath="/usr/share/java">
-      <classpath>
-        <fileset dir="/usr/share/java" includes="**/*.jar"/>
-      </classpath>
-    </javac>
-  </target>
-
-  <!-- Generate javadoc documentation: -->
-  <target name="javadoc" depends="compile">
-    <mkdir dir="javadoc"/>
-    <javadoc locale="en_US" sourcepath="src" destdir="javadoc" windowtitle="RelaxNGCC" public="yes">
-      <package name="relaxngcc.*"/>
-      <classpath>
-        <fileset dir="/usr/share/java" includes="*.jar"/>
-      </classpath>
-    </javadoc>
-  </target>
-
-  <!-- Create the jar file: -->
-  <target name="jar" depends="compile">
-    <tstamp/>
-    <jar jarfile="relaxngcc.jar">
-      <manifest>
-        <attribute name="Version" value="${DSTAMP}"/>
-        <attribute name="Main-Class" value="relaxngcc.RelaxNGCC"/>
-       </manifest>
-      <fileset dir="src" includes="**/*.properties"/>
-      <fileset dir="src" includes="**/*.xsl"/>
-      <fileset dir="src" includes="**/*.jelly"/>
-      <fileset dir="src" includes="relaxngcc/runtime/*.java"/>
-      <fileset dir="bin" includes="**/*.class"/>
-      <fileset dir="." includes="project.xml"/>
-    </jar>
-  </target>
-
-</project>
diff --git a/debian/rules b/debian/rules
index 8addf15..b419ade 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,17 +14,12 @@ ZIP = relaxngcc-$(ZVERSION).zip
 	dh $@ --with javahelper
 
 override_dh_auto_build:
-	ln -s debian/relaxngcc-build.xml build.xml
 	dh_auto_build -- \
 		-Dant.build.javac.source=1.5 \
 		-Dant.build.javac.target=1.5 \
 		jar \
 		javadoc
 
-override_dh_auto_clean:
-	dh_auto_clean
-	-rm -f build.xml
-
 get-orig-source:
 	wget http://prdownloads.sourceforge.net/relaxngcc/relaxngcc-$(ZVERSION).zip
 	unzip relaxngcc-$(ZVERSION).zip

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