[aspectj] 02/04: Removed the Java 8 compatibility patch (fixed upstream)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository aspectj.

commit 78a755eea73e70558a32ba292f6071f0fff301f5
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 29 18:38:56 2015 +0200

    Removed the Java 8 compatibility patch (fixed upstream)
---
 debian/changelog                           |  8 ++++++++
 debian/patches/10_java8-compatibility.diff | 12 ------------
 debian/patches/series                      |  1 -
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4e23f9..9d2bbff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+aspectj (1.8.5-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Removed the Java 8 compatibility patch (fixed upstream)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 29 Apr 2015 18:36:07 +0200
+
 aspectj (1.8.3-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/10_java8-compatibility.diff b/debian/patches/10_java8-compatibility.diff
deleted file mode 100644
index 7ddaef0..0000000
--- a/debian/patches/10_java8-compatibility.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Fix for building on Java8
-Author: Andy Clement
-Origin: backport, http://git.eclipse.org/c/aspectj/org.aspectj.git/patch/?id=9a1aa6d
---- a/ajde.core/.classpath
-+++ b/ajde.core/.classpath
-@@ -9,5 +9,6 @@
- 	<classpathentry exported="true" kind="src" path="/org.eclipse.jdt.core"/>
- 	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/junit-src.jar"/>
- 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-+	<classpathentry combineaccessrules="false" kind="src" path="/weaver"/>
- 	<classpathentry kind="output" path="bin"/>
- </classpath>
diff --git a/debian/patches/series b/debian/patches/series
index 6c002b7..45b6a86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ ant_0_8_fix.diff
 07_javadoc_links.diff
 use_system_asm.diff
 09_compile-bcel-builder.diff
-10_java8-compatibility.diff

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