Package: remotetea Version: 1.0.7-2 Followup-For: Bug #678380 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu quantal ubuntu-patch
*** /tmp/tmpmW0S8q/bug_body In Ubuntu, the attached patch was applied to fix this FTBFS, by doing the following changes: * debian/patches/add-build-xml.patch: Added build.xml, replacing original patch, which appeared to be an auto-generated one. * debian/patches/set-encoding.patch: Fix FTBFS by setting encoding on javac and javadoc tasks. Thanks for considering the patch. -- System Information: Debian Release: wheezy/sid APT prefers precise-updates APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise-proposed'), (500, 'precise') Architecture: i386 (i686) Kernel: Linux 3.2.0-30-generic (SMP w/2 CPU cores) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
=== added file '.pc/.quilt_patches' --- .pc/.quilt_patches 1970-01-01 00:00:00 +0000 +++ .pc/.quilt_patches 2012-08-02 01:02:25 +0000 @@ -0,0 +1 @@ +debian/patches === added file '.pc/.quilt_series' --- .pc/.quilt_series 1970-01-01 00:00:00 +0000 +++ .pc/.quilt_series 2012-08-02 01:02:25 +0000 @@ -0,0 +1 @@ +series === added directory '.pc/add-build-xml.patch' === added file '.pc/add-build-xml.patch/.timestamp' === added file '.pc/add-build-xml.patch/build.xml' === modified file '.pc/applied-patches' --- .pc/applied-patches 2011-01-03 14:53:36 +0000 +++ .pc/applied-patches 2012-08-02 02:06:00 +0000 @@ -1 +1,2 @@ -debian/build.xml +add-build-xml.patch +set-encoding.patch === removed directory '.pc/debian' === removed directory '.pc/debian/build.xml' === removed file '.pc/debian/build.xml/build.xml' === added directory '.pc/set-encoding.patch' === added file '.pc/set-encoding.patch/.timestamp' === added file '.pc/set-encoding.patch/build.xml' --- .pc/set-encoding.patch/build.xml 1970-01-01 00:00:00 +0000 +++ .pc/set-encoding.patch/build.xml 2012-08-02 02:00:08 +0000 @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + $Header: /cvsroot-fuse/remotetea/remotetea/build.xml,v 1.7 2008/01/05 17:21:45 haraldalbrecht Exp $ + + build.xml - contains the ANT rules for building Remote Tea + + --> +<project name="Remote Tea" default="jar" basedir="."> + + <!-- --> + <property name="buildDir" value="classes"/> + <property name="srcDir" value="src"/> + <property name="javadocDir" value="javadoc"/> + <property name="distDir" value="dist"/> + + <property name="distVersion" value="1.0.8"/> + + <!-- --> + <!-- ** SF patch #943219: add compile target ** --> + <!-- Compile classes --> + <target name="compile" description="compile classes"> + <mkdir dir="${buildDir}"/> + <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> + </javac> + </target> + + <target name="clean" description="clean build"> + <delete dir="${buildDir}"/> + <delete dir="${javadocDir}"/> + </target> + + <!-- Generate JAR files: + * oncrpc.jar contains the ONC/RPC client and server functionality, + * jrpcgen.jar contains the x-file protocol compiler, + * jportmap.jar contains an ONC/RPC portmapper including base libraries + (so older JREs have no problems executing it standalone). + --> + <!-- ** SF patch #943219: add compile target / compile dependency ** --> + <target name="jar" description="generate jar files" depends="compile"> + <delete file="${buildDir}/oncrpc.jar"/> + <jar jarfile="${buildDir}/oncrpc.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class"> + <manifest> + <attribute name="Extension-Name" value="ONC/RPC"/> + <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/> + <attribute name="Specification-Version" value="2.0"/> + <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> + <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/> + <attribute name="Implementation-Version" value="${distVersion}"/> + <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> + </manifest> + </jar> + <delete file="${buildDir}/jrpcgen.jar"/> + <!-- ** SF patch #943215: include Ant task with jrpcgen.jar ** --> + <jar jarfile="${buildDir}/jrpcgen.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/apps/jrpcgen/**/*.class,org/acplt/oncrpc/ant/*.class"> + <manifest> + <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jrpcgen.jrpcgen"/> + <attribute name="Extension-Name" value="ONC/RPC"/> + <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> + <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/> + <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> + <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> + <attribute name="Implementation-Version" value="${distVersion}"/> + <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> + </manifest> + </jar> + <delete file="${buildDir}/portmap.jar"/> + <jar jarfile="${buildDir}/portmap.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class,org/acplt/oncrpc/apps/jportmap/*.class"> + <manifest> + <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jportmap.jportmap"/> + <attribute name="Extension-Name" value="ONC/RPC"/> + <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> + <attribute name="Specification-Version" value="2.0"/> + <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> + <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> + <attribute name="Implementation-Version" value="${distVersion}"/> + <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> + </manifest> + </jar> + </target> + + <!-- Generate JavaDoc --> + <target name="javadoc" description="generate JavaDoc documentation files"> + <delete dir="${javadocDir}"/> + <mkdir dir="${javadocDir}"/> + <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on"> + <package name="org.acplt.oncrpc"/> + <package name="org.acplt.oncrpc.server"/> + <package name="org.acplt.oncrpc.web"/> + <package name="org.acplt.oncrpc.apps.jrpcgen"/> + <package name="org.acplt.oncrpc.apps.jportmap"/> + <package name="org.acplt.oncrpc.apps.ant"/> + </javadoc> + </target> + + <!-- Generate SF file packages --> + <target name="sf" description="generate SF file packages" depends="jar,javadoc"> + <echo>generating SF file packages for version ${distVersion}...</echo> + <mkdir dir="${distDir}"/> + <!-- binary plus documentation distribution --> + <zip zipfile="${distDir}/remotetea-bin-doc.zip"> + <zipfileset dir="." prefix="remotetea/"> + <include name="${buildDir}/*.jar"/> + <include name="${javadocDir}/"/> + </zipfileset> + <zipfileset dir="." prefix="remotetea/"> + <include name="readme.html"/> + <include name="changelog.html"/> + <include name="docstyle.css"/> + <include name="COPYING.LIB"/> + <include name="build.xml"/> + </zipfileset> + </zip> + <!-- source only distribution --> + <zip zipfile="${distDir}/remotetea-src.zip"> + <zipfileset dir="." prefix="remotetea/"> + <include name=".project"/> + <include name=".classpath"/> + <include name="readme.html"/> + <include name="changelog.html"/> + <include name="docstyle.css"/> + <include name="COPYING.LIB"/> + </zipfileset> + <zipfileset dir="." prefix="remotetea/"> + <include name="${srcDir}/"/> + </zipfileset> + </zip> + </target> + + <!-- compile Jrpcgen test example and compile resulting Java files --> + <target name="jrpcgen-test" description="run jrpcgen test"> + <echo>Cleaning up example mess...</echo> + <delete><!-- make a fresh start so we don't get bitten by damaged example source code --> + <fileset dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" includes="*.java" excludes="demoClientExample.java demoServer.java"/> + </delete> + <echo>Compiling Jrpcgen protocol compiler...</echo> + <antcall target="compile"/> + <echo>Running Jrpcgen x protocol compiler on demo.x...</echo> + <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes"> + <arg value="-verbose"/> + <arg value="-ser"/> + <arg value="-bean"/> + <arg value="-p"/> + <arg value="tests.org.acplt.oncrpc.jrpcgen"/> + <arg value="-nobackup"/> + <arg value="demo.x"/> + </java> + <echo>Running Jrpcgen x protocol compiler on demo2.x...</echo> + <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes"> + <arg value="-verbose"/> + <arg value="-p"/> + <arg value="tests.org.acplt.oncrpc.jrpcgen"/> + <arg value="-nobackup"/> + <arg value="demo2.x"/> + </java> + <echo>Compiling example mess...</echo> + <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> + </javac> + <echo>Succeeded.</echo> + </target> + +</project> +<!-- End of build.xml --> === modified file 'build.xml' --- build.xml 2009-08-03 15:11:28 +0000 +++ build.xml 2012-08-02 02:06:00 +0000 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- $Header: /cvsroot-fuse/remotetea/remotetea/build.xml,v 1.7 2008/01/05 17:21:45 haraldalbrecht Exp $ - + build.xml - contains the ANT rules for building Remote Tea - + --> <project name="Remote Tea" default="jar" basedir="."> @@ -12,7 +12,7 @@ <property name="srcDir" value="src"/> <property name="javadocDir" value="javadoc"/> <property name="distDir" value="dist"/> - + <property name="distVersion" value="1.0.8"/> <!-- --> @@ -20,7 +20,7 @@ <!-- Compile classes --> <target name="compile" description="compile classes"> <mkdir dir="${buildDir}"/> - <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> + <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1"> </javac> </target> @@ -41,12 +41,12 @@ <jar jarfile="${buildDir}/oncrpc.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class"> <manifest> <attribute name="Extension-Name" value="ONC/RPC"/> - <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/> - <attribute name="Specification-Version" value="2.0"/> - <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> - <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/> - <attribute name="Implementation-Version" value="${distVersion}"/> - <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> + <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/> + <attribute name="Specification-Version" value="2.0"/> + <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> + <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/> + <attribute name="Implementation-Version" value="${distVersion}"/> + <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> </manifest> </jar> <delete file="${buildDir}/jrpcgen.jar"/> @@ -55,12 +55,12 @@ <manifest> <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jrpcgen.jrpcgen"/> <attribute name="Extension-Name" value="ONC/RPC"/> - <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> - <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/> - <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> - <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> - <attribute name="Implementation-Version" value="${distVersion}"/> - <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> + <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> + <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/> + <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> + <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> + <attribute name="Implementation-Version" value="${distVersion}"/> + <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> </manifest> </jar> <delete file="${buildDir}/portmap.jar"/> @@ -68,21 +68,21 @@ <manifest> <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jportmap.jportmap"/> <attribute name="Extension-Name" value="ONC/RPC"/> - <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> - <attribute name="Specification-Version" value="2.0"/> - <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> - <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> - <attribute name="Implementation-Version" value="${distVersion}"/> - <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> + <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> + <attribute name="Specification-Version" value="2.0"/> + <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> + <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> + <attribute name="Implementation-Version" value="${distVersion}"/> + <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> </manifest> </jar> </target> - + <!-- Generate JavaDoc --> <target name="javadoc" description="generate JavaDoc documentation files"> <delete dir="${javadocDir}"/> <mkdir dir="${javadocDir}"/> - <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on"> + <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on" encoding="ISO-8859-1"> <package name="org.acplt.oncrpc"/> <package name="org.acplt.oncrpc.server"/> <package name="org.acplt.oncrpc.web"/> @@ -153,10 +153,10 @@ <arg value="demo2.x"/> </java> <echo>Compiling example mess...</echo> - <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> + <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1"> </javac> <echo>Succeeded.</echo> </target> - + </project> <!-- End of build.xml --> === modified file 'debian/changelog' === modified file 'debian/control' --- debian/control 2011-01-03 14:53:36 +0000 +++ debian/control 2012-08-02 02:03:21 +0000 @@ -1,7 +1,8 @@ Source: remotetea Section: java Priority: extra -Maintainer: Picca Frédéric-Emmanuel <pi...@synchrotron-soleil.fr> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Picca Frédéric-Emmanuel <pi...@synchrotron-soleil.fr> Build-Depends: debhelper (>= 7.0.50), javahelper, default-jdk, ant Standards-Version: 3.9.1 Homepage: http://remotetea.sourceforge.net === added file 'debian/patches/add-build-xml.patch' --- debian/patches/add-build-xml.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/add-build-xml.patch 2012-08-02 02:03:12 +0000 @@ -0,0 +1,171 @@ +Description: add the ant build.xml file +Author: Picca Frédéric-Emmanuel <pi...@synchrotron-soleil.fr> +Last-Update: 2012-08-01 +x +Index: fix-for-888995/build.xml +=================================================================== +--- /dev/null 1970-01-01 00:00:00.000000000 +0000 ++++ fix-for-888995/build.xml 2012-08-01 21:55:49.490565153 -0300 +@@ -0,0 +1,162 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!-- ++ $Header: /cvsroot-fuse/remotetea/remotetea/build.xml,v 1.7 2008/01/05 17:21:45 haraldalbrecht Exp $ ++ ++ build.xml - contains the ANT rules for building Remote Tea ++ ++ --> ++<project name="Remote Tea" default="jar" basedir="."> ++ ++ <!-- --> ++ <property name="buildDir" value="classes"/> ++ <property name="srcDir" value="src"/> ++ <property name="javadocDir" value="javadoc"/> ++ <property name="distDir" value="dist"/> ++ ++ <property name="distVersion" value="1.0.8"/> ++ ++ <!-- --> ++ <!-- ** SF patch #943219: add compile target ** --> ++ <!-- Compile classes --> ++ <target name="compile" description="compile classes"> ++ <mkdir dir="${buildDir}"/> ++ <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> ++ </javac> ++ </target> ++ ++ <target name="clean" description="clean build"> ++ <delete dir="${buildDir}"/> ++ <delete dir="${javadocDir}"/> ++ </target> ++ ++ <!-- Generate JAR files: ++ * oncrpc.jar contains the ONC/RPC client and server functionality, ++ * jrpcgen.jar contains the x-file protocol compiler, ++ * jportmap.jar contains an ONC/RPC portmapper including base libraries ++ (so older JREs have no problems executing it standalone). ++ --> ++ <!-- ** SF patch #943219: add compile target / compile dependency ** --> ++ <target name="jar" description="generate jar files" depends="compile"> ++ <delete file="${buildDir}/oncrpc.jar"/> ++ <jar jarfile="${buildDir}/oncrpc.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class"> ++ <manifest> ++ <attribute name="Extension-Name" value="ONC/RPC"/> ++ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/> ++ <attribute name="Specification-Version" value="2.0"/> ++ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> ++ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/> ++ <attribute name="Implementation-Version" value="${distVersion}"/> ++ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> ++ </manifest> ++ </jar> ++ <delete file="${buildDir}/jrpcgen.jar"/> ++ <!-- ** SF patch #943215: include Ant task with jrpcgen.jar ** --> ++ <jar jarfile="${buildDir}/jrpcgen.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/apps/jrpcgen/**/*.class,org/acplt/oncrpc/ant/*.class"> ++ <manifest> ++ <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jrpcgen.jrpcgen"/> ++ <attribute name="Extension-Name" value="ONC/RPC"/> ++ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> ++ <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/> ++ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> ++ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/> ++ <attribute name="Implementation-Version" value="${distVersion}"/> ++ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> ++ </manifest> ++ </jar> ++ <delete file="${buildDir}/portmap.jar"/> ++ <jar jarfile="${buildDir}/portmap.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class,org/acplt/oncrpc/apps/jportmap/*.class"> ++ <manifest> ++ <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jportmap.jportmap"/> ++ <attribute name="Extension-Name" value="ONC/RPC"/> ++ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> ++ <attribute name="Specification-Version" value="2.0"/> ++ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/> ++ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/> ++ <attribute name="Implementation-Version" value="${distVersion}"/> ++ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/> ++ </manifest> ++ </jar> ++ </target> ++ ++ <!-- Generate JavaDoc --> ++ <target name="javadoc" description="generate JavaDoc documentation files"> ++ <delete dir="${javadocDir}"/> ++ <mkdir dir="${javadocDir}"/> ++ <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on"> ++ <package name="org.acplt.oncrpc"/> ++ <package name="org.acplt.oncrpc.server"/> ++ <package name="org.acplt.oncrpc.web"/> ++ <package name="org.acplt.oncrpc.apps.jrpcgen"/> ++ <package name="org.acplt.oncrpc.apps.jportmap"/> ++ <package name="org.acplt.oncrpc.apps.ant"/> ++ </javadoc> ++ </target> ++ ++ <!-- Generate SF file packages --> ++ <target name="sf" description="generate SF file packages" depends="jar,javadoc"> ++ <echo>generating SF file packages for version ${distVersion}...</echo> ++ <mkdir dir="${distDir}"/> ++ <!-- binary plus documentation distribution --> ++ <zip zipfile="${distDir}/remotetea-bin-doc.zip"> ++ <zipfileset dir="." prefix="remotetea/"> ++ <include name="${buildDir}/*.jar"/> ++ <include name="${javadocDir}/"/> ++ </zipfileset> ++ <zipfileset dir="." prefix="remotetea/"> ++ <include name="readme.html"/> ++ <include name="changelog.html"/> ++ <include name="docstyle.css"/> ++ <include name="COPYING.LIB"/> ++ <include name="build.xml"/> ++ </zipfileset> ++ </zip> ++ <!-- source only distribution --> ++ <zip zipfile="${distDir}/remotetea-src.zip"> ++ <zipfileset dir="." prefix="remotetea/"> ++ <include name=".project"/> ++ <include name=".classpath"/> ++ <include name="readme.html"/> ++ <include name="changelog.html"/> ++ <include name="docstyle.css"/> ++ <include name="COPYING.LIB"/> ++ </zipfileset> ++ <zipfileset dir="." prefix="remotetea/"> ++ <include name="${srcDir}/"/> ++ </zipfileset> ++ </zip> ++ </target> ++ ++ <!-- compile Jrpcgen test example and compile resulting Java files --> ++ <target name="jrpcgen-test" description="run jrpcgen test"> ++ <echo>Cleaning up example mess...</echo> ++ <delete><!-- make a fresh start so we don't get bitten by damaged example source code --> ++ <fileset dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" includes="*.java" excludes="demoClientExample.java demoServer.java"/> ++ </delete> ++ <echo>Compiling Jrpcgen protocol compiler...</echo> ++ <antcall target="compile"/> ++ <echo>Running Jrpcgen x protocol compiler on demo.x...</echo> ++ <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes"> ++ <arg value="-verbose"/> ++ <arg value="-ser"/> ++ <arg value="-bean"/> ++ <arg value="-p"/> ++ <arg value="tests.org.acplt.oncrpc.jrpcgen"/> ++ <arg value="-nobackup"/> ++ <arg value="demo.x"/> ++ </java> ++ <echo>Running Jrpcgen x protocol compiler on demo2.x...</echo> ++ <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes"> ++ <arg value="-verbose"/> ++ <arg value="-p"/> ++ <arg value="tests.org.acplt.oncrpc.jrpcgen"/> ++ <arg value="-nobackup"/> ++ <arg value="demo2.x"/> ++ </java> ++ <echo>Compiling example mess...</echo> ++ <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> ++ </javac> ++ <echo>Succeeded.</echo> ++ </target> ++ ++</project> ++<!-- End of build.xml --> === modified file 'debian/patches/series' --- debian/patches/series 2011-01-03 14:53:36 +0000 +++ debian/patches/series 2012-08-02 01:02:37 +0000 @@ -1 +1,2 @@ -debian/build.xml +add-build-xml.patch +set-encoding.patch === added file 'debian/patches/set-encoding.patch' --- debian/patches/set-encoding.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/set-encoding.patch 2012-08-02 01:02:37 +0000 @@ -0,0 +1,31 @@ +Index: fix-for-888995/build.xml +=================================================================== +--- fix-for-888995.orig/build.xml 2012-08-01 21:55:49.490565153 -0300 ++++ fix-for-888995/build.xml 2012-08-01 21:58:49.963460059 -0300 +@@ -20,7 +20,7 @@ + <!-- Compile classes --> + <target name="compile" description="compile classes"> + <mkdir dir="${buildDir}"/> +- <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> ++ <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1"> + </javac> + </target> + +@@ -82,7 +82,7 @@ + <target name="javadoc" description="generate JavaDoc documentation files"> + <delete dir="${javadocDir}"/> + <mkdir dir="${javadocDir}"/> +- <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on"> ++ <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on" encoding="ISO-8859-1"> + <package name="org.acplt.oncrpc"/> + <package name="org.acplt.oncrpc.server"/> + <package name="org.acplt.oncrpc.web"/> +@@ -153,7 +153,7 @@ + <arg value="demo2.x"/> + </java> + <echo>Compiling example mess...</echo> +- <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true"> ++ <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1"> + </javac> + <echo>Succeeded.</echo> + </target>