[relaxngcc] 01/01: ship build.xml as a real file, not patch, upstream cvs has their own which doesn't work for us

[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 a4c6b47fbbdde41ab489df080f84c596b2e8364c
Author: Timo Aaltonen <tjaalton at ubuntu.com>
Date:   Thu Feb 27 12:18:05 2014 +0200

    ship build.xml as a real file, not patch, upstream cvs has their own which doesn't work for us
---
 debian/build.xml                  | 73 ++++++++++++++++++++++++++++++++++++
 debian/patches/add-build-xml.diff | 79 ---------------------------------------
 debian/patches/series             |  1 -
 debian/rules                      |  2 +
 debian/source/local-options       |  1 -
 5 files changed, 75 insertions(+), 81 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
new file mode 100644
index 0000000..a01f77c
--- /dev/null
+++ b/debian/build.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0"?>
+
+<project name="relaxngcc" default="jar">
+
+  <!-- Clean up: -->
+  <target name="clean">
+    <delete dir="bin"/>
+    <delete dir="javadoc"/>
+    <delete dir="lib"/>
+    <delete dir="src/relaxngcc/parser/automata"/>
+    <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>
+
+  <!-- use the built RelaxNGCC to compile the parser -->
+  <target name="ngcc">
+    <taskdef name="relaxngcc" classname="relaxngcc.ant.RelaxNGCCTask">
+      <classpath path="relaxngcc.jar"/>
+    </taskdef>
+        <mkdir dir="src/relaxngcc/parser/automata"/>
+
+    <relaxngcc source="src/relaxngcc/parser/relaxng.rng"
+      targetdir="src/relaxngcc/parser/state"
+      automata="src/relaxngcc/parser/automata">
+    </relaxngcc>
+
+    <relaxngcc source="src/relaxngcc/datatype/datatype.rng"
+      targetdir="src/relaxngcc/datatype/parser">
+    </relaxngcc>
+  </target>
+
+</project>
diff --git a/debian/patches/add-build-xml.diff b/debian/patches/add-build-xml.diff
deleted file mode 100644
index a485fb3..0000000
--- a/debian/patches/add-build-xml.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-Author: Timo Aaltonen <tjaalton at ubuntu.com>
-Subject: add build.xml file
-
---- /dev/null
-+++ b/build.xml
-@@ -0,0 +1,73 @@
-+<?xml version="1.0"?>
-+
-+<project name="relaxngcc" default="jar">
-+
-+  <!-- Clean up: -->
-+  <target name="clean">
-+    <delete dir="bin"/>
-+    <delete dir="javadoc"/>
-+    <delete dir="lib"/>
-+    <delete dir="src/relaxngcc/parser/automata"/>
-+    <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>
-+
-+  <!-- use the built RelaxNGCC to compile the parser -->
-+  <target name="ngcc">
-+    <taskdef name="relaxngcc" classname="relaxngcc.ant.RelaxNGCCTask">
-+      <classpath path="relaxngcc.jar"/>
-+    </taskdef>
-+        <mkdir dir="src/relaxngcc/parser/automata"/>
-+
-+    <relaxngcc source="src/relaxngcc/parser/relaxng.rng"
-+      targetdir="src/relaxngcc/parser/state"
-+      automata="src/relaxngcc/parser/automata">
-+    </relaxngcc>
-+
-+    <relaxngcc source="src/relaxngcc/datatype/datatype.rng"
-+      targetdir="src/relaxngcc/datatype/parser">
-+    </relaxngcc>
-+  </target>
-+
-+</project>
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8eade6e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add-build-xml.diff
diff --git a/debian/rules b/debian/rules
index 29e13db..346cd2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ ZIP = relaxngcc-$(ZVERSION).zip
 	dh $@ --with javahelper
 
 override_dh_auto_build:
+	cp debian/build.xml .
 	dh_auto_build -- \
 		-Dant.build.javac.source=1.5 \
 		-Dant.build.javac.target=1.5 \
@@ -37,6 +38,7 @@ override_dh_auto_clean:
 	# move original files in place
 	test ! -d state-orig || (mv state-orig/* src/relaxngcc/parser/state && rmdir state-orig)
 	test ! -d parser-orig || (mv parser-orig/* src/relaxngcc/datatype/parser && rmdir parser-orig)
+	rm -f build.xml
 
 get-orig-source:
 	wget http://prdownloads.sourceforge.net/relaxngcc/relaxngcc-$(ZVERSION).zip
diff --git a/debian/source/local-options b/debian/source/local-options
deleted file mode 100644
index 4aceb10..0000000
--- a/debian/source/local-options
+++ /dev/null
@@ -1 +0,0 @@
-unapply-patches

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