[remotetea] 01/06: Merged NMU changes 1.0.7-2.1
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Mon Nov 24 00:30:44 GMT 2014
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository remotetea.
commit 04106560b14bf85f569b5d073ec83a6da020f36e
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon Nov 24 00:20:26 2014 +0100
Merged NMU changes 1.0.7-2.1
---
debian/changelog | 15 +++++
.../{debian/build.xml => add-build-xml.patch} | 77 +++++++++-------------
debian/patches/series | 3 +-
debian/patches/set-encoding.patch | 31 +++++++++
4 files changed, 78 insertions(+), 48 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3266762..b0bfbe9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <gregoa at 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 --git a/debian/patches/debian/build.xml b/debian/patches/add-build-xml.patch
similarity index 83%
rename from debian/patches/debian/build.xml
rename to debian/patches/add-build-xml.patch
index 2e6313e..24c3884 100644
--- a/debian/patches/debian/build.xml
+++ b/debian/patches/add-build-xml.patch
@@ -1,35 +1,18 @@
-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.
+Description: add the ant build.xml file
Author: Picca Frédéric-Emmanuel <picca at 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
+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=".">
+
@@ -38,7 +21,7 @@ Last-Update: <YYYY-MM-DD>
+ <property name="srcDir" value="src"/>
+ <property name="javadocDir" value="javadoc"/>
+ <property name="distDir" value="dist"/>
-+
++
+ <property name="distVersion" value="1.0.8"/>
+
+ <!-- -->
@@ -67,12 +50,12 @@ Last-Update: <YYYY-MM-DD>
+ <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"/>
@@ -81,12 +64,12 @@ Last-Update: <YYYY-MM-DD>
+ <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"/>
@@ -94,16 +77,16 @@ Last-Update: <YYYY-MM-DD>
+ <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}"/>
@@ -183,6 +166,6 @@ Last-Update: <YYYY-MM-DD>
+ </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
More information about the pkg-java-commits
mailing list