[robocode] 10/11: Refresh ecj.patch
Markus Koschany
apo at moszumanska.debian.org
Sun Apr 30 15:33:00 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository robocode.
commit 2bd2d8ca00a7016101b2a8e83b3994335af1cf5a
Author: Markus Koschany <apo at debian.org>
Date: Sun Apr 30 16:28:40 2017 +0200
Refresh ecj.patch
---
debian/changelog | 1 +
debian/patches/ecj.patch | 24 ++++++++++++++++++++++++
debian/patches/series | 1 +
debian/patches/showJavaDocumentation.patch | 4 ++--
4 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 22cc028..73a7a23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ robocode (1.9.2.6-1) experimental; urgency=medium
* Update copyright years.
* Drop deprecated menu file and do not create xpm image anymore.
Remove build-dependency on imagemagick.
+ * Refresh ecj.patch.
-- Markus Koschany <apo at debian.org> Sun, 30 Apr 2017 16:22:47 +0200
diff --git a/debian/patches/ecj.patch b/debian/patches/ecj.patch
new file mode 100644
index 0000000..5a48419
--- /dev/null
+++ b/debian/patches/ecj.patch
@@ -0,0 +1,24 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 30 Apr 2017 16:27:35 +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(-)
+
+diff --git a/robocode.content/pom.xml b/robocode.content/pom.xml
+index 10773e0..adcce04 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
+ <artifactItem>
+ <groupId>org.eclipse.jdt.core.compiler</groupId>
+ <artifactId>ecj</artifactId>
+- <version>4.6.1</version>
++ <version>debian</version>
+ <type>jar</type>
+ <overWrite>false</overWrite>
+ <outputDirectory>${project.build.directory}/classes/compilers</outputDirectory>
diff --git a/debian/patches/series b/debian/patches/series
index 94aa85b..27b86c5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
showJavaDocumentation.patch
+ecj.patch
diff --git a/debian/patches/showJavaDocumentation.patch b/debian/patches/showJavaDocumentation.patch
index 8b96889..75d700d 100644
--- a/debian/patches/showJavaDocumentation.patch
+++ b/debian/patches/showJavaDocumentation.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java b/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java
-index e150b9f..3fca70b 100644
+index 22aeb9c..674681f 100644
--- a/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java
+++ b/robocode.ui/src/main/java/net/sf/robocode/ui/WindowManager.java
@@ -250,7 +250,7 @@ public class WindowManager implements IWindowManagerExt {
@@ -22,7 +22,7 @@ index e150b9f..3fca70b 100644
public void showRobocodeHome() {
diff --git a/robocode.ui/src/main/java/net/sf/robocode/ui/dialog/MenuBar.java b/robocode.ui/src/main/java/net/sf/robocode/ui/dialog/MenuBar.java
-index cc68d4c..f06e03e 100644
+index 7e63e50..5c57038 100644
--- a/robocode.ui/src/main/java/net/sf/robocode/ui/dialog/MenuBar.java
+++ b/robocode.ui/src/main/java/net/sf/robocode/ui/dialog/MenuBar.java
@@ -656,7 +656,7 @@ public class MenuBar extends JMenuBar {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/robocode.git
More information about the pkg-java-commits
mailing list