This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository robocode.

commit b64f228724c88fb729248db9a57fd2afa7691307
Author: Markus Koschany <[email protected]>
Date:   Mon Mar 19 19:34:28 2018 +0100

    Add maven-assembly.patch
---
 debian/patches/maven-assembly.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series               |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/maven-assembly.patch 
b/debian/patches/maven-assembly.patch
new file mode 100644
index 0000000..8af6515
--- /dev/null
+++ b/debian/patches/maven-assembly.patch
@@ -0,0 +1,26 @@
+From: Markus Koschany <[email protected]>
+Date: Mon, 19 Mar 2018 19:34:14 +0100
+Subject: maven assembly
+
+Fix FTBFS with OpenJDK 9 / maven-assembly-plugin.
+
+Bug-Debian: https://bugs.debian.org/893415
+Forwarded: no
+---
+ robocode.distribution/setup.asm.xml | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/robocode.distribution/setup.asm.xml 
b/robocode.distribution/setup.asm.xml
+index b804006..711349e 100644
+--- a/robocode.distribution/setup.asm.xml
++++ b/robocode.distribution/setup.asm.xml
+@@ -85,6 +85,9 @@
+                       
<directory>../robocode.api/target/site/apidocs</directory>
+                       <outputDirectory>javadoc</outputDirectory>
+                       <lineEnding>lf</lineEnding> <!-- for Unix/Linux -->
++                      <excludes>
++                              <exclude>**/*.zip</exclude>
++                      </excludes>
+               </fileSet>
+       </fileSets>
+       <files>
diff --git a/debian/patches/series b/debian/patches/series
index 222b54e..1a1735f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 ecj.patch
 showJavaDocumentation.patch
+maven-assembly.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/robocode.git

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to