tags 442716 +patch thankyou Hi!
Please find attached a patch which applies against the svn version of qdox at pkg-java. It does these things: 1. Fixes the FTBFS if built twice. 2. Removes the dependence of the version on the packaging, somewhat. The links file must be removed, however. HTH. Kumar -- Kumar Appaiah, 458, Jamuna Hostel, Indian Institute of Technology Madras, Chennai - 600 036
Index: debian/patches/01_build_files.patch
===================================================================
--- debian/patches/01_build_files.patch (revision 4193)
+++ debian/patches/01_build_files.patch (working copy)
@@ -1,13 +1,14 @@
---- build.xml.old 2006-10-28 15:01:37.000000000 +0000
-+++ build.xml 2007-04-11 12:46:52.000000000 +0000
-@@ -3,7 +3,32 @@
+diff -Nur qdox-1.6.1/build.xml qdox-1.6.1.new/build.xml
+--- qdox-1.6.1/build.xml 2006-10-28 20:31:37.000000000 +0530
++++ qdox-1.6.1.new/build.xml 2007-09-17 20:50:59.000000000 +0530
+@@ -3,7 +3,33 @@
<!--build.xml generated by maven from project.xml version 1.6.1
on date October 28 2006, time 1601-->
-<project default="jar" name="qdox" basedir=".">
+<project name="qdox" basedir=".">
+
-+ <property name="final.name" value="qdox-1.6.1"/>
++ <property name="final.name" value="qdox"/>
+ <property name="javadocdir" value="target/javadoc"/>
+
+ <target name="debian-init">
@@ -21,6 +22,7 @@
+ </target>
+
+ <target name="debian-clean" depends="clean">
++ <delete dir="target"/>
+ <delete dir="tmp"/>
+ </target>
+
@@ -34,7 +36,16 @@
<property name="defaulttargetdir" value="target">
</property>
<property name="libdir" value="target/lib">
-@@ -47,6 +72,8 @@
+@@ -20,7 +46,7 @@
+ </property>
+ <property name="javadocdir" value="dist/docs/api">
+ </property>
+- <property name="final.name" value="qdox-1.6.1">
++ <property name="final.name" value="qdox">
+ </property>
+ <path id="build.classpath">
+ <fileset dir="${libdir}">
+@@ -47,6 +73,8 @@
<src>
<pathelement location="src/java">
</pathelement>
@@ -43,7 +54,7 @@
</src>
<classpath refid="build.classpath">
</classpath>
-@@ -116,6 +143,8 @@
+@@ -116,6 +144,8 @@
<src>
<pathelement location="src/test">
</pathelement>
@@ -52,7 +63,7 @@
</src>
<classpath>
<path refid="build.classpath">
-@@ -161,4 +190,4 @@
+@@ -161,4 +191,4 @@
<unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar">
</unjar>
</target>
Index: debian/rules
===================================================================
--- debian/rules (revision 4193)
+++ debian/rules (working copy)
@@ -19,6 +19,9 @@
PATCH_EXCLUDES=-x target -x src -x tmp -x debian -x core -x lib -x extensions -x examples -x .cvsignore
+clean::
+ -$(RM) -r target tmp
+
make-patches:
diff -r -uN $(PATCH_EXCLUDES) -x Parser.java -x JFlexLexer.java ../qdox-1.6.1 . > debian/patches/01_build_files || true
diff -r -uN $(PATCH_EXCLUDES) /dev/null Parser.java > debian/patches/02_parser_files || true
signature.asc
Description: Digital signature
