tags 678380 + pending thanks Dear maintainer,
I've prepared an NMU for remotetea (versioned as 1.0.7-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06 : :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of the Free Software Foundation Europe `- NP: Frank Zappa: Stairway To Heaven
diff -Nru remotetea-1.0.7/debian/changelog remotetea-1.0.7/debian/changelog
--- remotetea-1.0.7/debian/changelog 2011-01-03 14:56:22.000000000 +0100
+++ remotetea-1.0.7/debian/changelog 2013-05-27 19:16:37.000000000 +0200
@@ -1,3 +1,18 @@
+remotetea (1.0.7-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix "FTBFS with Java7 as default java":
+ apply patch from Ubuntu / James Page:
+
+ - 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.
+
+ (Closes: #678380)
+
+ -- gregor herrmann <gre...@debian.org> Mon, 27 May 2013 19:16:34 +0200
+
remotetea (1.0.7-2) unstable; urgency=low
* Bump Standards-Version to 3.9.1
diff -Nru remotetea-1.0.7/debian/patches/add-build-xml.patch remotetea-1.0.7/debian/patches/add-build-xml.patch
--- remotetea-1.0.7/debian/patches/add-build-xml.patch 1970-01-01 01:00:00.000000000 +0100
+++ remotetea-1.0.7/debian/patches/add-build-xml.patch 2013-05-27 19:12:16.000000000 +0200
@@ -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 -->
diff -Nru remotetea-1.0.7/debian/patches/debian/build.xml remotetea-1.0.7/debian/patches/debian/build.xml
--- remotetea-1.0.7/debian/patches/debian/build.xml 2011-01-03 15:44:30.000000000 +0100
+++ remotetea-1.0.7/debian/patches/debian/build.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,188 +0,0 @@
-Description: add the ant build.xml file
- remotetea (1.0.7-2) unstable; urgency=low
- .
- * Bump Standards-Version to 3.9.1
- * Switch to dpkg-source 3.0 (quilt) format.
- * register the documentation with doc-base
- .
- The person named in the Author field signed this changelog entry.
-Author: Picca Frédéric-Emmanuel <pi...@synchrotron-soleil.fr>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- /dev/null
-+++ remotetea-1.0.7/build.xml
-@@ -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 -->
diff -Nru remotetea-1.0.7/debian/patches/series remotetea-1.0.7/debian/patches/series
--- remotetea-1.0.7/debian/patches/series 2011-01-03 15:41:27.000000000 +0100
+++ remotetea-1.0.7/debian/patches/series 2013-05-27 19:12:33.000000000 +0200
@@ -1 +1,2 @@
-debian/build.xml
+add-build-xml.patch
+set-encoding.patch
diff -Nru remotetea-1.0.7/debian/patches/set-encoding.patch remotetea-1.0.7/debian/patches/set-encoding.patch
--- remotetea-1.0.7/debian/patches/set-encoding.patch 1970-01-01 01:00:00.000000000 +0100
+++ remotetea-1.0.7/debian/patches/set-encoding.patch 2013-05-27 19:12:33.000000000 +0200
@@ -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>
signature.asc
Description: Digital signature
