[pkg-java] r19200 - in trunk/ecj/debian: . patches poms

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2017-01-10 22:46:17 +0000 (Tue, 10 Jan 2017)
New Revision: 19200

Modified:
   trunk/ecj/debian/changelog
   trunk/ecj/debian/patches/remove-overrides.diff
   trunk/ecj/debian/poms/ecj.pom
   trunk/ecj/debian/rules
Log:
New upstream release (JDT version 4.5.1)



Modified: trunk/ecj/debian/changelog
===================================================================
--- trunk/ecj/debian/changelog	2017-01-10 17:40:40 UTC (rev 19199)
+++ trunk/ecj/debian/changelog	2017-01-10 22:46:17 UTC (rev 19200)
@@ -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.

Modified: trunk/ecj/debian/patches/remove-overrides.diff
===================================================================
--- trunk/ecj/debian/patches/remove-overrides.diff	2017-01-10 17:40:40 UTC (rev 19199)
+++ trunk/ecj/debian/patches/remove-overrides.diff	2017-01-10 22:46:17 UTC (rev 19200)
@@ -490,7 +490,7 @@
  		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 @@
  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);
  }

Modified: trunk/ecj/debian/poms/ecj.pom
===================================================================
--- trunk/ecj/debian/poms/ecj.pom	2017-01-10 17:40:40 UTC (rev 19199)
+++ trunk/ecj/debian/poms/ecj.pom	2017-01-10 22:46:17 UTC (rev 19200)
@@ -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>

Modified: trunk/ecj/debian/rules
===================================================================
--- trunk/ecj/debian/rules	2017-01-10 17:40:40 UTC (rev 19199)
+++ trunk/ecj/debian/rules	2017-01-10 22:46:17 UTC (rev 19200)
@@ -236,8 +236,8 @@
 	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 @@
 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)