This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository uddi4j.
commit e61007401a1a43596a56c30359c12ec02e4ea15b Author: Markus Koschany <a...@debian.org> Date: Fri Dec 22 14:29:58 2017 +0100 Update build.xml-encoding.patch and also fix the javadoc encoding. Otherwise the documentation will not be built. --- debian/patches/build.xml-encoding.patch | 24 ++++++++++++++++++++---- debian/patches/java9.patch | 2 +- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/debian/patches/build.xml-encoding.patch b/debian/patches/build.xml-encoding.patch index 9dab8ce..50fec23 100644 --- a/debian/patches/build.xml-encoding.patch +++ b/debian/patches/build.xml-encoding.patch @@ -1,9 +1,17 @@ -Description: fix FTBFS with java 7 -Author: Ilya Barygin <randomact...@ubuntu.com> -Bug-Ubuntu: https://launchpad.net/bugs/1009480 +From: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Date: Fri, 22 Dec 2017 14:29:19 +0100 +Subject: build.xml-encoding + +Use the correct encoding otherwise the documentation will not be built or the +package fails to build from source. + +Forwarded: no +--- + build.xml | 3 +++ + 1 file changed, 3 insertions(+) diff --git a/build.xml b/build.xml -index 1a183f5..9a89aef 100644 +index 1a183f5..19f607a 100644 --- a/build.xml +++ b/build.xml @@ -152,6 +152,7 @@ Authors: @@ -22,3 +30,11 @@ index 1a183f5..9a89aef 100644 debug="${debug}"> <classpath> <path refid="uddi4j.build.classpath"/> +@@ -194,6 +196,7 @@ Authors: + <target name="javadocs" depends="init"> + <mkdir dir="${build.javadocs}"/> + <javadoc packagenames="${packages}" ++ encoding="windows-1252" + destdir="${build.javadocs}" + author="true" + version="true" diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch index 0cf9196..7f72359 100644 --- a/debian/patches/java9.patch +++ b/debian/patches/java9.patch @@ -12,7 +12,7 @@ Forwarded: no 1 file changed, 1 insertion(+) diff --git a/build.xml b/build.xml -index 9a89aef..6f167ae 100644 +index 19f607a..d21a3ce 100644 --- a/build.xml +++ b/build.xml @@ -161,6 +161,7 @@ Authors: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/uddi4j.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits