Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany · Markus Koschany
--- a/debian/changelog
+++ b/debian/changelog
+robocode (1.9.3.2-1) unstable; urgency=medium
+
+  * New upstream version 1.9.3.2.
+  * Declare compliance with Debian Policy 4.1.5.
+  * Update debian/watch for latest upstream release.
+  * Update ecj.patch for new release.
+
+ -- Markus Koschany <apo@debian.org>  Mon, 30 Jul 2018 10:14:46 +0200
+
 robocode (1.9.3.1-1) unstable; urgency=medium

  * New upstream version 1.9.3.1.

--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Build-Depends:
 libpicocontainer-java,
 libpicocontainer-java-doc,
 maven-debian-helper
-Standards-Version: 4.1.3
+Standards-Version: 4.1.5
 Homepage: http://robocode.sourceforge.net/
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/robocode.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/robocode.git

--- a/debian/patches/ecj.patch
+++ b/debian/patches/ecj.patch
 From: Markus Koschany <apo@debian.org>
-Date: Sun, 30 Apr 2017 16:27:35 +0200
+Date: Mon, 30 Jul 2018 11:37:10 +0200
 Subject: ecj

-Fix FTBFS due to wrong ecj version.
-
-Forwarded: not-needed
 ---
- robocode.content/pom.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ robocode.content/pom.xml | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)

 diff --git a/robocode.content/pom.xml b/robocode.content/pom.xml
-index 10773e0..adcce04 100644
+index 11c852c..e44b3d2 100644
 --- a/robocode.content/pom.xml
 +++ b/robocode.content/pom.xml
-@@ -39,7 +39,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
+@@ -43,9 +43,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
+ 						<configuration>
+ 							<artifactItems>
 								<artifactItem>
- 									<groupId>org.eclipse.jdt.core.compiler</groupId>
- 									<artifactId>ecj</artifactId>
-									<version>4.6.1</version>
+-									<groupId>org.eclipse.jdt</groupId>
+-									<artifactId>org.eclipse.jdt.core</artifactId>
+-									<version>3.14.0.v20180305-0940</version>
+									<groupId>org.eclipse.jdt.core.compiler</groupId>
+									<artifactId>ecj</artifactId>
 +									<version>debian</version>
 									<type>jar</type>
 									<overWrite>false</overWrite>

--- a/debian/patches/series
+++ b/debian/patches/series
-ecj.patch
 showJavaDocumentation.patch
 maven-assembly.patch
+ecj.patch
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 PKD := $(abspath $(dir $(MAKEFILE_LIST)))
 VER := $(shell dpkg-parsechangelog -l$(PKD)/changelog -SVersion | cut -d- -f1)
 PKG := robocode
-COMMIT := 7c4818ae84292490652f1d6c1dd7e05203cb4f11
+COMMIT := 895548cab62d73a6ca2233eeb13d4f6222cd6324

 %:
 	dh $@

--- a/debian/watch
+++ b/debian/watch
 version=4
-opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/robocode-$1\.tar\.gz/ \
-  https://github.com/robo-code/robocode/tags .*/v?(\d\S+)\.tar\.gz
+opts=uversionmangle=s/_/./g \
+  https://github.com/robo-code/robocode/tags .*/VER_?(\d\S+)\.tar\.gz
--- a/robocode.api/.classpath
+++ b/robocode.api/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/java"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 </classpath>
--- a/robocode.api/.project
+++ b/robocode.api/.project
@@ -2,10 +2,13 @@
 <projectDescription>
 	<name>robocode.api</name>
 	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
-  <projects/>
+	<projects>
+	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
@@ -16,8 +19,14 @@
 				</dictionary>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
--- a/robocode.api/.settings/org.eclipse.jdt.core.prefs
+++ b/robocode.api/.settings/org.eclipse.jdt.core.prefs
-#Tue Nov 27 22:12:08 CET 2012
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 eclipse.preferences.version=1
 encoding/src/main/java=8859_1
-org.eclipse.jdt.core.compiler.source=1.6
-encoding/src/test/resources=8859_1
 encoding/src/main/resources=8859_1
 encoding/src/test/java=8859_1
+encoding/src/test/resources=8859_1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
--- a/robocode.api/Robocode.launch
+++ b/robocode.api/Robocode.launch
@@ -6,8 +6,9 @@
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
 <listEntry value="1"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;true&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;directory nest=&amp;quot;true&amp;quot; path=&amp;quot;D:\robocode-work&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.directory&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-<listEntry value="org.eclipse.debug.ui.launchGroup.profile"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 </listAttribute>
@@ -23,9 +24,11 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;robocode.ui.editor&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;M2_REPO/org/picocontainer/picocontainer/2.14.2/picocontainer-2.14.2.jar&quot; path=&quot;3&quot; type=&quot;3&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="robocode.Robocode"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="robocode.api"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DROBOTPATH=${workspace_loc:robocode.samples/target/classes} -Xmx512m"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-DROBOTPATH=${workspace_loc:robocode.samples/target/classes}&#13;&#10;-Xmx512m&#13;&#10;-XX:+IgnoreUnrecognizedVMOptions&#13;&#10;&quot;--add-opens=java.base/sun.net.www.protocol.jar=ALL-UNNAMED&quot;&#13;&#10;&quot;--add-opens=java.base/java.lang.reflect=ALL-UNNAMED&quot;&#13;&#10;&quot;--add-opens=java.desktop/sun.awt=ALL-UNNAMED&quot;"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:robocode.api/target/launch}"/>
 </launchConfiguration>
--- a/robocode.battle/.classpath
+++ b/robocode.battle/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="/robocode.api"/>
 	<classpathentry kind="src" path="/robocode.core"/>
 	<classpathentry kind="var" path="M2_REPO/org/picocontainer/picocontainer/2.14.2/picocontainer-2.14.2.jar"/>
 	<classpathentry kind="src" path="/robocode.host"/>
 	<classpathentry kind="src" path="/robocode.repository"/>
 	<classpathentry kind="var" path="M2_REPO/net/sf/robocode/codesize/1.1/codesize-1.1.jar"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/robocode.battle/.project
+++ b/robocode.battle/.project
@@ -11,9 +11,17 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
--- a/robocode.battle/.settings/org.eclipse.jdt.core.prefs
+++ b/robocode.battle/.settings/org.eclipse.jdt.core.prefs
-#Tue Nov 27 22:12:09 CET 2012
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 eclipse.preferences.version=1
 encoding/src/main/java=8859_1
-org.eclipse.jdt.core.compiler.source=1.6
-encoding/src/test/resources=8859_1
 encoding/src/main/resources=8859_1
 encoding/src/test/java=8859_1
+encoding/src/test/resources=8859_1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
--- a/robocode.content/.classpath
+++ b/robocode.content/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/_svn/**|**/.svn/**|**/.git/**|**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="/robocode.samples"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/robocode.content/.project
+++ b/robocode.content/.project
@@ -8,9 +8,17 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
--- a/robocode.content/.settings/org.eclipse.jdt.core.prefs
+++ b/robocode.content/.settings/org.eclipse.jdt.core.prefs
-#Tue Nov 27 22:12:09 CET 2012
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 eclipse.preferences.version=1
 encoding/src/main/java=8859_1
-org.eclipse.jdt.core.compiler.source=1.6
-encoding/src/test/resources=8859_1
 encoding/src/main/resources=8859_1
 encoding/src/test/java=8859_1
+encoding/src/test/resources=8859_1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6
--- a/robocode.content/pom.xml
+++ b/robocode.content/pom.xml
@@ -22,6 +22,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 			</exclusions>
 		</dependency>
 	</dependencies>
+	<repositories>
+		<repository>
+			<id>eclipse-staging</id>
+			<url>https://repo.eclipse.org/content/repositories/eclipse-staging</url>
+		</repository>
+	</repositories>
 	<build>
 		<plugins>
 			<plugin>
@@ -37,9 +43,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 						<configuration>
 							<artifactItems>
 								<artifactItem>
-									<groupId>org.eclipse.jdt.core.compiler</groupId>
-									<artifactId>ecj</artifactId>
-									<version>4.6.1</version>
+									<groupId>org.eclipse.jdt</groupId>
+									<artifactId>org.eclipse.jdt.core</artifactId>
+									<version>3.14.0.v20180305-0940</version>
 									<type>jar</type>
 									<overWrite>false</overWrite>
 									<outputDirectory>${project.build.directory}/classes/compilers</outputDirectory>

--- a/robocode.core/.classpath
+++ b/robocode.core/.classpath
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-  <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="src" path="src/main/resources" excluding="**/_svn/**|**/.svn/**|**/.git/**|**/*.java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="/robocode.api"/>
 	<classpathentry kind="var" path="M2_REPO/org/picocontainer/picocontainer/2.14.2/picocontainer-2.14.2.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit/junit/4.11/junit-4.11.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>
--- a/robocode.core/.project
+++ b/robocode.core/.project
@@ -8,9 +8,17 @@
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
--- a/robocode.core/.settings/org.eclipse.jdt.core.prefs
+++ b/robocode.core/.settings/org.eclipse.jdt.core.prefs
-#Tue Nov 27 22:12:08 CET 2012
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 eclipse.preferences.version=1
 encoding/src/main/java=8859_1
-org.eclipse.jdt.core.compiler.source=1.6
-encoding/src/test/resources=8859_1
 encoding/src/main/resources=8859_1
 encoding/src/test/java=8859_1
+encoding/src/test/resources=8859_1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.6