Ubuntu
remotetea package

Merge lp:~scarneiro/ubuntu/quantal/remotetea/fix-for-888995 into lp:ubuntu/quantal/remotetea

  1. Quantal (12.10)
  2. fix-for-888995
  3. Merge into quantal
Proposed by Sebastian Carneiro
Status: Merged
Merged at revision: 4
Proposed branch: lp:~scarneiro/ubuntu/quantal/remotetea/fix-for-888995
Merge into: lp:ubuntu/quantal/remotetea
Diff against target: 560 lines (+407/-29)
10 files modified
.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/applied-patches (+2/-1)
.pc/set-encoding.patch/build.xml (+162/-0)
build.xml (+26/-26)
debian/changelog (+9/-0)
debian/control (+2/-1)
debian/patches/add-build-xml.patch (+171/-0)
debian/patches/series (+2/-1)
debian/patches/set-encoding.patch (+31/-0)
To merge this branch: bzr merge lp:~scarneiro/ubuntu/quantal/remotetea/fix-for-888995
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Ubuntu branches Pending
Review via email: mp+117822@code.launchpad.net

Description of the change

- Cleaned original patch that generates build.xml, since it seems to be auto-generated and not in the right format.
- Added patch that sets encoding on javac and javadoc ant tasks to fix FTBFS with Java7.

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Good work! Do you think you can forward the patch to Debian too?

review: Approve
Revision history for this message
Sebastian Carneiro (scarneiro) wrote :

Thank you, Daniel!

Sure, patch was attached to Debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678380

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.pc/.quilt_patches'
2--- .pc/.quilt_patches 1970-01-01 00:00:00 +0000
3+++ .pc/.quilt_patches 2012-08-02 02:12:19 +0000
4@@ -0,0 +1,1 @@
5+debian/patches
6
7=== added file '.pc/.quilt_series'
8--- .pc/.quilt_series 1970-01-01 00:00:00 +0000
9+++ .pc/.quilt_series 2012-08-02 02:12:19 +0000
10@@ -0,0 +1,1 @@
11+series
12
13=== added directory '.pc/add-build-xml.patch'
14=== added file '.pc/add-build-xml.patch/.timestamp'
15=== added file '.pc/add-build-xml.patch/build.xml'
16=== modified file '.pc/applied-patches'
17--- .pc/applied-patches 2011-01-03 14:53:36 +0000
18+++ .pc/applied-patches 2012-08-02 02:12:19 +0000
19@@ -1,1 +1,2 @@
20-debian/build.xml
21+add-build-xml.patch
22+set-encoding.patch
23
24=== removed directory '.pc/debian'
25=== removed directory '.pc/debian/build.xml'
26=== removed file '.pc/debian/build.xml/build.xml'
27=== added directory '.pc/set-encoding.patch'
28=== added file '.pc/set-encoding.patch/.timestamp'
29=== added file '.pc/set-encoding.patch/build.xml'
30--- .pc/set-encoding.patch/build.xml 1970-01-01 00:00:00 +0000
31+++ .pc/set-encoding.patch/build.xml 2012-08-02 02:12:19 +0000
32@@ -0,0 +1,162 @@
33+<?xml version="1.0" encoding="UTF-8"?>
34+<!--
35+ $Header: /cvsroot-fuse/remotetea/remotetea/build.xml,v 1.7 2008/01/05 17:21:45 haraldalbrecht Exp $
36+
37+ build.xml - contains the ANT rules for building Remote Tea
38+
39+ -->
40+<project name="Remote Tea" default="jar" basedir=".">
41+
42+ <!-- -->
43+ <property name="buildDir" value="classes"/>
44+ <property name="srcDir" value="src"/>
45+ <property name="javadocDir" value="javadoc"/>
46+ <property name="distDir" value="dist"/>
47+
48+ <property name="distVersion" value="1.0.8"/>
49+
50+ <!-- -->
51+ <!-- ** SF patch #943219: add compile target ** -->
52+ <!-- Compile classes -->
53+ <target name="compile" description="compile classes">
54+ <mkdir dir="${buildDir}"/>
55+ <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
56+ </javac>
57+ </target>
58+
59+ <target name="clean" description="clean build">
60+ <delete dir="${buildDir}"/>
61+ <delete dir="${javadocDir}"/>
62+ </target>
63+
64+ <!-- Generate JAR files:
65+ * oncrpc.jar contains the ONC/RPC client and server functionality,
66+ * jrpcgen.jar contains the x-file protocol compiler,
67+ * jportmap.jar contains an ONC/RPC portmapper including base libraries
68+ (so older JREs have no problems executing it standalone).
69+ -->
70+ <!-- ** SF patch #943219: add compile target / compile dependency ** -->
71+ <target name="jar" description="generate jar files" depends="compile">
72+ <delete file="${buildDir}/oncrpc.jar"/>
73+ <jar jarfile="${buildDir}/oncrpc.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class">
74+ <manifest>
75+ <attribute name="Extension-Name" value="ONC/RPC"/>
76+ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/>
77+ <attribute name="Specification-Version" value="2.0"/>
78+ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
79+ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/>
80+ <attribute name="Implementation-Version" value="${distVersion}"/>
81+ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
82+ </manifest>
83+ </jar>
84+ <delete file="${buildDir}/jrpcgen.jar"/>
85+ <!-- ** SF patch #943215: include Ant task with jrpcgen.jar ** -->
86+ <jar jarfile="${buildDir}/jrpcgen.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/apps/jrpcgen/**/*.class,org/acplt/oncrpc/ant/*.class">
87+ <manifest>
88+ <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jrpcgen.jrpcgen"/>
89+ <attribute name="Extension-Name" value="ONC/RPC"/>
90+ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
91+ <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/>
92+ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
93+ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
94+ <attribute name="Implementation-Version" value="${distVersion}"/>
95+ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
96+ </manifest>
97+ </jar>
98+ <delete file="${buildDir}/portmap.jar"/>
99+ <jar jarfile="${buildDir}/portmap.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class,org/acplt/oncrpc/apps/jportmap/*.class">
100+ <manifest>
101+ <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jportmap.jportmap"/>
102+ <attribute name="Extension-Name" value="ONC/RPC"/>
103+ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
104+ <attribute name="Specification-Version" value="2.0"/>
105+ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
106+ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
107+ <attribute name="Implementation-Version" value="${distVersion}"/>
108+ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
109+ </manifest>
110+ </jar>
111+ </target>
112+
113+ <!-- Generate JavaDoc -->
114+ <target name="javadoc" description="generate JavaDoc documentation files">
115+ <delete dir="${javadocDir}"/>
116+ <mkdir dir="${javadocDir}"/>
117+ <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on">
118+ <package name="org.acplt.oncrpc"/>
119+ <package name="org.acplt.oncrpc.server"/>
120+ <package name="org.acplt.oncrpc.web"/>
121+ <package name="org.acplt.oncrpc.apps.jrpcgen"/>
122+ <package name="org.acplt.oncrpc.apps.jportmap"/>
123+ <package name="org.acplt.oncrpc.apps.ant"/>
124+ </javadoc>
125+ </target>
126+
127+ <!-- Generate SF file packages -->
128+ <target name="sf" description="generate SF file packages" depends="jar,javadoc">
129+ <echo>generating SF file packages for version ${distVersion}...</echo>
130+ <mkdir dir="${distDir}"/>
131+ <!-- binary plus documentation distribution -->
132+ <zip zipfile="${distDir}/remotetea-bin-doc.zip">
133+ <zipfileset dir="." prefix="remotetea/">
134+ <include name="${buildDir}/*.jar"/>
135+ <include name="${javadocDir}/"/>
136+ </zipfileset>
137+ <zipfileset dir="." prefix="remotetea/">
138+ <include name="readme.html"/>
139+ <include name="changelog.html"/>
140+ <include name="docstyle.css"/>
141+ <include name="COPYING.LIB"/>
142+ <include name="build.xml"/>
143+ </zipfileset>
144+ </zip>
145+ <!-- source only distribution -->
146+ <zip zipfile="${distDir}/remotetea-src.zip">
147+ <zipfileset dir="." prefix="remotetea/">
148+ <include name=".project"/>
149+ <include name=".classpath"/>
150+ <include name="readme.html"/>
151+ <include name="changelog.html"/>
152+ <include name="docstyle.css"/>
153+ <include name="COPYING.LIB"/>
154+ </zipfileset>
155+ <zipfileset dir="." prefix="remotetea/">
156+ <include name="${srcDir}/"/>
157+ </zipfileset>
158+ </zip>
159+ </target>
160+
161+ <!-- compile Jrpcgen test example and compile resulting Java files -->
162+ <target name="jrpcgen-test" description="run jrpcgen test">
163+ <echo>Cleaning up example mess...</echo>
164+ <delete><!-- make a fresh start so we don't get bitten by damaged example source code -->
165+ <fileset dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" includes="*.java" excludes="demoClientExample.java demoServer.java"/>
166+ </delete>
167+ <echo>Compiling Jrpcgen protocol compiler...</echo>
168+ <antcall target="compile"/>
169+ <echo>Running Jrpcgen x protocol compiler on demo.x...</echo>
170+ <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes">
171+ <arg value="-verbose"/>
172+ <arg value="-ser"/>
173+ <arg value="-bean"/>
174+ <arg value="-p"/>
175+ <arg value="tests.org.acplt.oncrpc.jrpcgen"/>
176+ <arg value="-nobackup"/>
177+ <arg value="demo.x"/>
178+ </java>
179+ <echo>Running Jrpcgen x protocol compiler on demo2.x...</echo>
180+ <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes">
181+ <arg value="-verbose"/>
182+ <arg value="-p"/>
183+ <arg value="tests.org.acplt.oncrpc.jrpcgen"/>
184+ <arg value="-nobackup"/>
185+ <arg value="demo2.x"/>
186+ </java>
187+ <echo>Compiling example mess...</echo>
188+ <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
189+ </javac>
190+ <echo>Succeeded.</echo>
191+ </target>
192+
193+</project>
194+<!-- End of build.xml -->
195
196=== modified file 'build.xml'
197--- build.xml 2009-08-03 15:11:28 +0000
198+++ build.xml 2012-08-02 02:12:19 +0000
199@@ -1,9 +1,9 @@
200 <?xml version="1.0" encoding="UTF-8"?>
201 <!--
202 $Header: /cvsroot-fuse/remotetea/remotetea/build.xml,v 1.7 2008/01/05 17:21:45 haraldalbrecht Exp $
203-
204+
205 build.xml - contains the ANT rules for building Remote Tea
206-
207+
208 -->
209 <project name="Remote Tea" default="jar" basedir=".">
210
211@@ -12,7 +12,7 @@
212 <property name="srcDir" value="src"/>
213 <property name="javadocDir" value="javadoc"/>
214 <property name="distDir" value="dist"/>
215-
216+
217 <property name="distVersion" value="1.0.8"/>
218
219 <!-- -->
220@@ -20,7 +20,7 @@
221 <!-- Compile classes -->
222 <target name="compile" description="compile classes">
223 <mkdir dir="${buildDir}"/>
224- <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
225+ <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1">
226 </javac>
227 </target>
228
229@@ -41,12 +41,12 @@
230 <jar jarfile="${buildDir}/oncrpc.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class">
231 <manifest>
232 <attribute name="Extension-Name" value="ONC/RPC"/>
233- <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/>
234- <attribute name="Specification-Version" value="2.0"/>
235- <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
236- <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/>
237- <attribute name="Implementation-Version" value="${distVersion}"/>
238- <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
239+ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/>
240+ <attribute name="Specification-Version" value="2.0"/>
241+ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
242+ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/>
243+ <attribute name="Implementation-Version" value="${distVersion}"/>
244+ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
245 </manifest>
246 </jar>
247 <delete file="${buildDir}/jrpcgen.jar"/>
248@@ -55,12 +55,12 @@
249 <manifest>
250 <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jrpcgen.jrpcgen"/>
251 <attribute name="Extension-Name" value="ONC/RPC"/>
252- <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
253- <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/>
254- <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
255- <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
256- <attribute name="Implementation-Version" value="${distVersion}"/>
257- <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
258+ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
259+ <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/>
260+ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
261+ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
262+ <attribute name="Implementation-Version" value="${distVersion}"/>
263+ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
264 </manifest>
265 </jar>
266 <delete file="${buildDir}/portmap.jar"/>
267@@ -68,21 +68,21 @@
268 <manifest>
269 <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jportmap.jportmap"/>
270 <attribute name="Extension-Name" value="ONC/RPC"/>
271- <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
272- <attribute name="Specification-Version" value="2.0"/>
273- <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
274- <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
275- <attribute name="Implementation-Version" value="${distVersion}"/>
276- <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
277+ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
278+ <attribute name="Specification-Version" value="2.0"/>
279+ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
280+ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
281+ <attribute name="Implementation-Version" value="${distVersion}"/>
282+ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
283 </manifest>
284 </jar>
285 </target>
286-
287+
288 <!-- Generate JavaDoc -->
289 <target name="javadoc" description="generate JavaDoc documentation files">
290 <delete dir="${javadocDir}"/>
291 <mkdir dir="${javadocDir}"/>
292- <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on">
293+ <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on" encoding="ISO-8859-1">
294 <package name="org.acplt.oncrpc"/>
295 <package name="org.acplt.oncrpc.server"/>
296 <package name="org.acplt.oncrpc.web"/>
297@@ -153,10 +153,10 @@
298 <arg value="demo2.x"/>
299 </java>
300 <echo>Compiling example mess...</echo>
301- <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
302+ <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1">
303 </javac>
304 <echo>Succeeded.</echo>
305 </target>
306-
307+
308 </project>
309 <!-- End of build.xml -->
310
311=== modified file 'debian/changelog'
312--- debian/changelog 2011-01-03 14:53:36 +0000
313+++ debian/changelog 2012-08-02 02:12:19 +0000
314@@ -1,3 +1,12 @@
315+remotetea (1.0.7-2ubuntu1) quantal; urgency=low
316+
317+ * debian/patches/add-build-xml.patch: Added build.xml, replacing
318+ original patch, which appeared to be an auto-generated one.
319+ * debian/patches/set-encoding.patch: Fix FTBFS by setting encoding on
320+ javac and javadoc tasks. (LP: #888995)
321+
322+ -- Sebastian Carneiro <scarneiro@fibertel.com.ar> Wed, 01 Aug 2012 23:03:26 -0300
323+
324 remotetea (1.0.7-2) unstable; urgency=low
325
326 * Bump Standards-Version to 3.9.1
327
328=== modified file 'debian/control'
329--- debian/control 2011-01-03 14:53:36 +0000
330+++ debian/control 2012-08-02 02:12:19 +0000
331@@ -1,7 +1,8 @@
332 Source: remotetea
333 Section: java
334 Priority: extra
335-Maintainer: Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>
336+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
337+XSBC-Original-Maintainer: Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>
338 Build-Depends: debhelper (>= 7.0.50), javahelper, default-jdk, ant
339 Standards-Version: 3.9.1
340 Homepage: http://remotetea.sourceforge.net
341
342=== added file 'debian/patches/add-build-xml.patch'
343--- debian/patches/add-build-xml.patch 1970-01-01 00:00:00 +0000
344+++ debian/patches/add-build-xml.patch 2012-08-02 02:12:19 +0000
345@@ -0,0 +1,171 @@
346+Description: add the ant build.xml file
347+Author: Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr>
348+Last-Update: 2012-08-01
349+x
350+Index: fix-for-888995/build.xml
351+===================================================================
352+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
353++++ fix-for-888995/build.xml 2012-08-01 21:55:49.490565153 -0300
354+@@ -0,0 +1,162 @@
355++<?xml version="1.0" encoding="UTF-8"?>
356++<!--
357++ $Header: /cvsroot-fuse/remotetea/remotetea/build.xml,v 1.7 2008/01/05 17:21:45 haraldalbrecht Exp $
358++
359++ build.xml - contains the ANT rules for building Remote Tea
360++
361++ -->
362++<project name="Remote Tea" default="jar" basedir=".">
363++
364++ <!-- -->
365++ <property name="buildDir" value="classes"/>
366++ <property name="srcDir" value="src"/>
367++ <property name="javadocDir" value="javadoc"/>
368++ <property name="distDir" value="dist"/>
369++
370++ <property name="distVersion" value="1.0.8"/>
371++
372++ <!-- -->
373++ <!-- ** SF patch #943219: add compile target ** -->
374++ <!-- Compile classes -->
375++ <target name="compile" description="compile classes">
376++ <mkdir dir="${buildDir}"/>
377++ <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
378++ </javac>
379++ </target>
380++
381++ <target name="clean" description="clean build">
382++ <delete dir="${buildDir}"/>
383++ <delete dir="${javadocDir}"/>
384++ </target>
385++
386++ <!-- Generate JAR files:
387++ * oncrpc.jar contains the ONC/RPC client and server functionality,
388++ * jrpcgen.jar contains the x-file protocol compiler,
389++ * jportmap.jar contains an ONC/RPC portmapper including base libraries
390++ (so older JREs have no problems executing it standalone).
391++ -->
392++ <!-- ** SF patch #943219: add compile target / compile dependency ** -->
393++ <target name="jar" description="generate jar files" depends="compile">
394++ <delete file="${buildDir}/oncrpc.jar"/>
395++ <jar jarfile="${buildDir}/oncrpc.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class">
396++ <manifest>
397++ <attribute name="Extension-Name" value="ONC/RPC"/>
398++ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (core)"/>
399++ <attribute name="Specification-Version" value="2.0"/>
400++ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
401++ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (core)"/>
402++ <attribute name="Implementation-Version" value="${distVersion}"/>
403++ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
404++ </manifest>
405++ </jar>
406++ <delete file="${buildDir}/jrpcgen.jar"/>
407++ <!-- ** SF patch #943215: include Ant task with jrpcgen.jar ** -->
408++ <jar jarfile="${buildDir}/jrpcgen.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/apps/jrpcgen/**/*.class,org/acplt/oncrpc/ant/*.class">
409++ <manifest>
410++ <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jrpcgen.jrpcgen"/>
411++ <attribute name="Extension-Name" value="ONC/RPC"/>
412++ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
413++ <attribute name="Specification-Version" value="unknown (rpcgen x.x)"/>
414++ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
415++ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcgen)"/>
416++ <attribute name="Implementation-Version" value="${distVersion}"/>
417++ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
418++ </manifest>
419++ </jar>
420++ <delete file="${buildDir}/portmap.jar"/>
421++ <jar jarfile="${buildDir}/portmap.jar" basedir="${buildDir}" includes="org/acplt/oncrpc/*.class,org/acplt/oncrpc/server/*.class,org/acplt/oncrpc/apps/jportmap/*.class">
422++ <manifest>
423++ <attribute name="Main-Class" value="org.acplt.oncrpc.apps.jportmap.jportmap"/>
424++ <attribute name="Extension-Name" value="ONC/RPC"/>
425++ <attribute name="Specification-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
426++ <attribute name="Specification-Version" value="2.0"/>
427++ <attribute name="Specification-Vendor" value="Sun Microsystems, Inc"/>
428++ <attribute name="Implementation-Title" value="Open Network Computing Remote Procedure Call (rpcbind)"/>
429++ <attribute name="Implementation-Version" value="${distVersion}"/>
430++ <attribute name="Implementation-Vendor" value="RemoteTea SF Project"/>
431++ </manifest>
432++ </jar>
433++ </target>
434++
435++ <!-- Generate JavaDoc -->
436++ <target name="javadoc" description="generate JavaDoc documentation files">
437++ <delete dir="${javadocDir}"/>
438++ <mkdir dir="${javadocDir}"/>
439++ <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on">
440++ <package name="org.acplt.oncrpc"/>
441++ <package name="org.acplt.oncrpc.server"/>
442++ <package name="org.acplt.oncrpc.web"/>
443++ <package name="org.acplt.oncrpc.apps.jrpcgen"/>
444++ <package name="org.acplt.oncrpc.apps.jportmap"/>
445++ <package name="org.acplt.oncrpc.apps.ant"/>
446++ </javadoc>
447++ </target>
448++
449++ <!-- Generate SF file packages -->
450++ <target name="sf" description="generate SF file packages" depends="jar,javadoc">
451++ <echo>generating SF file packages for version ${distVersion}...</echo>
452++ <mkdir dir="${distDir}"/>
453++ <!-- binary plus documentation distribution -->
454++ <zip zipfile="${distDir}/remotetea-bin-doc.zip">
455++ <zipfileset dir="." prefix="remotetea/">
456++ <include name="${buildDir}/*.jar"/>
457++ <include name="${javadocDir}/"/>
458++ </zipfileset>
459++ <zipfileset dir="." prefix="remotetea/">
460++ <include name="readme.html"/>
461++ <include name="changelog.html"/>
462++ <include name="docstyle.css"/>
463++ <include name="COPYING.LIB"/>
464++ <include name="build.xml"/>
465++ </zipfileset>
466++ </zip>
467++ <!-- source only distribution -->
468++ <zip zipfile="${distDir}/remotetea-src.zip">
469++ <zipfileset dir="." prefix="remotetea/">
470++ <include name=".project"/>
471++ <include name=".classpath"/>
472++ <include name="readme.html"/>
473++ <include name="changelog.html"/>
474++ <include name="docstyle.css"/>
475++ <include name="COPYING.LIB"/>
476++ </zipfileset>
477++ <zipfileset dir="." prefix="remotetea/">
478++ <include name="${srcDir}/"/>
479++ </zipfileset>
480++ </zip>
481++ </target>
482++
483++ <!-- compile Jrpcgen test example and compile resulting Java files -->
484++ <target name="jrpcgen-test" description="run jrpcgen test">
485++ <echo>Cleaning up example mess...</echo>
486++ <delete><!-- make a fresh start so we don't get bitten by damaged example source code -->
487++ <fileset dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" includes="*.java" excludes="demoClientExample.java demoServer.java"/>
488++ </delete>
489++ <echo>Compiling Jrpcgen protocol compiler...</echo>
490++ <antcall target="compile"/>
491++ <echo>Running Jrpcgen x protocol compiler on demo.x...</echo>
492++ <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes">
493++ <arg value="-verbose"/>
494++ <arg value="-ser"/>
495++ <arg value="-bean"/>
496++ <arg value="-p"/>
497++ <arg value="tests.org.acplt.oncrpc.jrpcgen"/>
498++ <arg value="-nobackup"/>
499++ <arg value="demo.x"/>
500++ </java>
501++ <echo>Running Jrpcgen x protocol compiler on demo2.x...</echo>
502++ <java classname="org.acplt.oncrpc.apps.jrpcgen.jrpcgen" classpath="${buildDir}" dir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" fork="yes">
503++ <arg value="-verbose"/>
504++ <arg value="-p"/>
505++ <arg value="tests.org.acplt.oncrpc.jrpcgen"/>
506++ <arg value="-nobackup"/>
507++ <arg value="demo2.x"/>
508++ </java>
509++ <echo>Compiling example mess...</echo>
510++ <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
511++ </javac>
512++ <echo>Succeeded.</echo>
513++ </target>
514++
515++</project>
516++<!-- End of build.xml -->
517
518=== modified file 'debian/patches/series'
519--- debian/patches/series 2011-01-03 14:53:36 +0000
520+++ debian/patches/series 2012-08-02 02:12:19 +0000
521@@ -1,1 +1,2 @@
522-debian/build.xml
523+add-build-xml.patch
524+set-encoding.patch
525
526=== added file 'debian/patches/set-encoding.patch'
527--- debian/patches/set-encoding.patch 1970-01-01 00:00:00 +0000
528+++ debian/patches/set-encoding.patch 2012-08-02 02:12:19 +0000
529@@ -0,0 +1,31 @@
530+Index: fix-for-888995/build.xml
531+===================================================================
532+--- fix-for-888995.orig/build.xml 2012-08-01 21:55:49.490565153 -0300
533++++ fix-for-888995/build.xml 2012-08-01 21:58:49.963460059 -0300
534+@@ -20,7 +20,7 @@
535+ <!-- Compile classes -->
536+ <target name="compile" description="compile classes">
537+ <mkdir dir="${buildDir}"/>
538+- <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
539++ <javac srcdir="${srcDir}" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1">
540+ </javac>
541+ </target>
542+
543+@@ -82,7 +82,7 @@
544+ <target name="javadoc" description="generate JavaDoc documentation files">
545+ <delete dir="${javadocDir}"/>
546+ <mkdir dir="${javadocDir}"/>
547+- <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on">
548++ <javadoc sourcepath="${srcDir}" destdir="${javadocDir}" classpath="${buildDir}" private="true" author="on" encoding="ISO-8859-1">
549+ <package name="org.acplt.oncrpc"/>
550+ <package name="org.acplt.oncrpc.server"/>
551+ <package name="org.acplt.oncrpc.web"/>
552+@@ -153,7 +153,7 @@
553+ <arg value="demo2.x"/>
554+ </java>
555+ <echo>Compiling example mess...</echo>
556+- <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true">
557++ <javac srcdir="${srcDir}/tests/org/acplt/oncrpc/jrpcgen" destdir="${buildDir}" debug="true" deprecation="true" optimize="true" encoding="ISO-8859-1">
558+ </javac>
559+ <echo>Succeeded.</echo>
560+ </target>

Subscribers

People subscribed via source and target branches