This is an automated email from the git hooks/post-receive script. picca pushed a commit to branch patch-queue/master in repository remotetea.
commit d981fd564549e039283c8e1da1cecd429d3a6626 Author: Picca Frédéric-Emmanuel <[email protected]> Date: Tue May 14 19:03:11 2013 +0200 apply the ubuntu patch --- debian/control | 3 +- debian/patches/add-build-xml.patch | 171 +++++++++++++++++++++++++++++++++++++ debian/patches/series | 3 +- debian/patches/set-encoding.patch | 31 +++++++ 4 files changed, 206 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index ba2dae3..d68afb7 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,8 @@ Source: remotetea Section: java Priority: extra -Maintainer: Picca Frédéric-Emmanuel <[email protected]> +Maintainer: Ubuntu Developers <[email protected]> +XSBC-Original-Maintainer: Picca Frédéric-Emmanuel <[email protected]> Build-Depends: debhelper (>= 7.0.50), javahelper, default-jdk, ant Standards-Version: 3.9.1 Homepage: http://remotetea.sourceforge.net diff --git a/debian/patches/add-build-xml.patch b/debian/patches/add-build-xml.patch new file mode 100644 index 0000000..24c3884 --- /dev/null +++ b/debian/patches/add-build-xml.patch @@ -0,0 +1,171 @@ +Description: add the ant build.xml file +Author: Picca Frédéric-Emmanuel <[email protected]> +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 --git a/debian/patches/series b/debian/patches/series index 6cc54c9..e070174 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ -debian/build.xml +add-build-xml.patch +set-encoding.patch diff --git a/debian/patches/set-encoding.patch b/debian/patches/set-encoding.patch new file mode 100644 index 0000000..5918c51 --- /dev/null +++ b/debian/patches/set-encoding.patch @@ -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> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/remotetea.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
