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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2016-03-25 12:13:06 +0000 (Fri, 25 Mar 2016)
New Revision: 19018

Modified:
   trunk/ecj/debian/changelog
   trunk/ecj/debian/patches/gcc-changes.diff
   trunk/ecj/debian/patches/remove-overrides.diff
   trunk/ecj/debian/rules
   trunk/ecj/debian/watch
Log:
New upstream release (JDT version 4.4.2)



Modified: trunk/ecj/debian/changelog
===================================================================
--- trunk/ecj/debian/changelog	2016-03-25 08:48:04 UTC (rev 19017)
+++ trunk/ecj/debian/changelog	2016-03-25 12:13:06 UTC (rev 19018)
@@ -1,3 +1,11 @@
+ecj (3.10.2-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release (JDT version 4.4.2)
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 25 Mar 2016 12:39:06 +0100
+
 ecj (3.10.1-2) unstable; urgency=medium
 
   * Build using GCC 5.

Modified: trunk/ecj/debian/patches/gcc-changes.diff
===================================================================
--- trunk/ecj/debian/patches/gcc-changes.diff	2016-03-25 08:48:04 UTC (rev 19017)
+++ trunk/ecj/debian/patches/gcc-changes.diff	2016-03-25 12:13:06 UTC (rev 19018)
@@ -23,7 +23,7 @@
 +</project>
 --- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
 +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/impl/CompilerOptions.java
-@@ -1215,9 +1215,9 @@
+@@ -1219,9 +1219,9 @@
  		
  		// by default only lines and source attributes are generated.
  		this.produceDebugAttributes = ClassFileConstants.ATTR_SOURCE | ClassFileConstants.ATTR_LINES;

Modified: trunk/ecj/debian/patches/remove-overrides.diff
===================================================================
--- trunk/ecj/debian/patches/remove-overrides.diff	2016-03-25 08:48:04 UTC (rev 19017)
+++ trunk/ecj/debian/patches/remove-overrides.diff	2016-03-25 12:13:06 UTC (rev 19018)
@@ -21,7 +21,7 @@
  					}
 --- a/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
 +++ b/src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/classfmt/NonNullDefaultAwareTypeAnnotationWalker.java
-@@ -64,11 +64,9 @@
+@@ -75,11 +75,9 @@
  						'L', CharOperation.concatWith(environment.getNonNullAnnotationName(), '/'), ';');
  		// create the synthetic annotation:
  		return new IBinaryAnnotation() {

Modified: trunk/ecj/debian/rules
===================================================================
--- trunk/ecj/debian/rules	2016-03-25 08:48:04 UTC (rev 19017)
+++ trunk/ecj/debian/rules	2016-03-25 12:13:06 UTC (rev 19018)
@@ -234,7 +234,7 @@
 	rm -f debian/*.pyc ecj1
 	rm -rf debian/.mh
 
-TAG = R4_4
+TAG = R4_4_2
 DIR = ecj-$(DEB_UPSTREAM_VERSION)
 
 MAVEN_REPO  := http://repo1.maven.org/maven2

Modified: trunk/ecj/debian/watch
===================================================================
--- trunk/ecj/debian/watch	2016-03-25 08:48:04 UTC (rev 19017)
+++ trunk/ecj/debian/watch	2016-03-25 12:13:06 UTC (rev 19018)
@@ -5,5 +5,5 @@
 # The package caries the version of the compiler and the version of the platform
 # has to be hardcoded here to detect the new releases.
 #
-opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.4/" \
+opts="uversionmangle=s/_/./g,dversionmangle=s/.*/4.4.2/" \
 http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/refs/tags .*/R([\d_]+).tar.gz