[ecj] 111/145: New upstream release (JDT version 4.5.1)

[Emmanuel Bourg]

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

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

commit 7af449d7b8b58f038f318e0b0f99ca584eed4a6b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jan 10 22:46:17 2017 +0000

    New upstream release (JDT version 4.5.1)
---
 debian/changelog                     | 9 +++++++++
 debian/patches/remove-overrides.diff | 4 ++--
 debian/poms/ecj.pom                  | 2 +-
 debian/rules                         | 6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 20ef56f..68191de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ecj (3.11.1-1~exp1) experimental; urgency=medium
+
+  * Team upload.
+  * New upstream release (from the R4_5_1 tag, identifies itself as 3.11.1)
+    - Refreshed the patches
+    - Updated the version of the Maven pom
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Tue, 10 Jan 2017 23:34:53 +0100
+
 ecj (3.11.0-7) unstable; urgency=medium
 
   * Try to work around build failures on m68k, powerpcspe, ppc64 sh4, sparc64.
diff --git a/debian/patches/remove-overrides.diff b/debian/patches/remove-overrides.diff
index 0d08a2d..079ec2f 100644
--- a/debian/patches/remove-overrides.diff
+++ b/debian/patches/remove-overrides.diff
@@ -490,7 +490,7 @@ Forwarded: not-needed
  		public void acceptPotentiallyCompatibleMethods(MethodBinding[] methods) { /* ignore */ }
 --- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
 +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
-@@ -1053,7 +1053,6 @@
+@@ -1058,7 +1058,6 @@
  	this.inferenceContexts.put(method, infCtx18);
  }
  
@@ -498,7 +498,7 @@ Forwarded: not-needed
  public void registerResult(TypeBinding targetType, MethodBinding method) {
  	if (this.solutionsPerTargetType == null)
  		this.solutionsPerTargetType = new HashMap<TypeBinding, MethodBinding>();
-@@ -1075,7 +1074,6 @@
+@@ -1080,7 +1079,6 @@
  public InferenceContext18 freshInferenceContext(Scope scope) {
  	return new InferenceContext18(scope, this.arguments, this, this.outerInferenceContext);
  }
diff --git a/debian/poms/ecj.pom b/debian/poms/ecj.pom
index 18b4cd1..3258011 100644
--- a/debian/poms/ecj.pom
+++ b/debian/poms/ecj.pom
@@ -6,7 +6,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.jdt.core.compiler</groupId>
 	<artifactId>ecj</artifactId>
-	<version>3.11.0</version>
+	<version>3.11.1</version>
 	<packaging>jar</packaging>
 	<name>Eclipse ECJ</name>
 	<description>Eclipse JDT Core Batch Compiler</description>
diff --git a/debian/rules b/debian/rules
index d5b444a..995875a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -236,8 +236,8 @@ override_dh_clean:
 	rm -f debian/*.pyc ecj1
 	rm -rf debian/.mh
 
-TAG = R4_5
-DIR = ecj-$(DEB_UPSTREAM_VERSION)
+TAG = R4_5_1
+DIR = ecj-$(VERSION)
 
 MAVEN_REPO  := http://repo1.maven.org/maven2
 PACKAGE := ecj
@@ -245,7 +245,7 @@ PACKAGE := ecj
 get-orig-pom:
 	mkdir -p debian/poms
 	wget  -U NoSuchBrowser/1.0 -O debian/poms/$(PACKAGE).pom \
-        $(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(DEB_UPSTREAM_VERSION)/$(PACKAGE)-$(DEB_UPSTREAM_VERSION).pom
+        $(MAVEN_REPO)/org/eclipse/jdt/core/compiler/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom
 
 get-orig-source:
 	rm -rf $(DIR) $(TAG).tar.gz $(TAG)

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